Skip to content

[hotfix] Renamed TypeCodes to avoid name collisions with structs. #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2024
Merged

[hotfix] Renamed TypeCodes to avoid name collisions with structs. #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions includes/RhythmGameUtilities/Enums/TypeCode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ typedef enum TypeCode
{

/// BPM Marker
BPM,
BPM_Marker,

/// Time Signature Marker
TimeSignature,
TimeSignatureMarker,

/// Note Marker
Note,
NoteMarker,

/// Event Marker
Event
EventMarker

} TypeCodeType;

std::string ToString(TypeCode typeCode)
{
switch (typeCode)
{
case BPM:
case BPM_Marker:
return "B";
case TimeSignature:
case TimeSignatureMarker:
return "TS";
case Note:
case NoteMarker:
return "N";
case Event:
case EventMarker:
return "E";
}
}
Expand Down
8 changes: 4 additions & 4 deletions tests/RhythmGameUtilities/Enum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ void testNamedSection()

void testTypeCode()
{
assert(ToString(TypeCode::BPM) == "B");
assert(ToString(TypeCode::TimeSignature) == "TS");
assert(ToString(TypeCode::Note) == "N");
assert(ToString(TypeCode::Event) == "E");
assert(ToString(TypeCode::BPM_Marker) == "B");
assert(ToString(TypeCode::TimeSignatureMarker) == "TS");
assert(ToString(TypeCode::NoteMarker) == "N");
assert(ToString(TypeCode::EventMarker) == "E");

std::cout << ".";
}
Expand Down