actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't allow XToString for *_INVALID values. Nothing uses this and it makes the range assert not fire if the string array has one fewer entry than the enum.

Browse Source
This commit is contained in:
Chris Danford
2005-04-09 09:51:42 +00:00
parent dc7f16ed32
commit 7d31a0b2bb
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/EnumHelper.h
-4
View File
@@ -35,13 +35,9 @@ static inline void enum_add( T &val, int iAmt )
#define FOREACH_ENUM( e, max, var ) for( e var=(e)0; var<max; enum_add<e>( var, +1 ) ) #define FOREACH_ENUM( e, max, var ) for( e var=(e)0; var<max; enum_add<e>( var, +1 ) )
static const CString EMPTY_STRING;
#define XToString(X, CNT) \ #define XToString(X, CNT) \
const CString& X##ToString( X x ) \ const CString& X##ToString( X x ) \
{ \ { \
if( x == ARRAYSIZE(X##Names)+1 ) \
return EMPTY_STRING; \
ASSERT(unsigned(x) < CNT); \ ASSERT(unsigned(x) < CNT); \
return X##Names[x]; \ return X##Names[x]; \
} }