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

detach uptab from char_traits_char_nocase

Browse Source
This commit is contained in:
Glenn Maynard
2006-03-01 00:24:25 +00:00
parent 18fbd2e8a4
commit 26e8fbd0ae
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil.cpp
+1 -1
View File
@@ -1623,7 +1623,7 @@ RString Capitalize( const RString &s )
return s2;
}
unsigned char char_traits_char_nocase::uptab[256] =
unsigned char g_Uptab[256] =
{
0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
stepmania/src/RageUtil.h
+6 -6
View File
@@ -401,19 +401,19 @@ RString Capitalize( const RString &s );
#include <unistd.h> /* correct place with correct definitions */
#endif
extern unsigned char g_Uptab[256];
/* ASCII-only case insensitivity. */
struct char_traits_char_nocase: public char_traits<char>
{
static unsigned char uptab[256];
static inline bool eq( char c1, char c2 )
{ return uptab[(unsigned char)c1] == uptab[(unsigned char)c2]; }
{ return g_Uptab[(unsigned char)c1] == uptab[(unsigned char)c2]; }
static inline bool ne( char c1, char c2 )
{ return uptab[(unsigned char)c1] != uptab[(unsigned char)c2]; }
{ return g_Uptab[(unsigned char)c1] != uptab[(unsigned char)c2]; }
static inline bool lt( char c1, char c2 )
{ return uptab[(unsigned char)c1] < uptab[(unsigned char)c2]; }
{ return g_Uptab[(unsigned char)c1] < uptab[(unsigned char)c2]; }
static int compare( const char* s1, const char* s2, size_t n )
{
@@ -429,7 +429,7 @@ struct char_traits_char_nocase: public char_traits<char>
static inline char fasttoupper(char a)
{
return uptab[(unsigned char)a];
return g_Uptab[(unsigned char)a];
}
static const char *find( const char* s, int n, char a )