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

fix VC7 "nonstandard conversion: auto_ptr to auto_ptr&". The param to operator= is a reference.

Browse Source
This commit is contained in:
Chris Danford
2006-01-05 05:57:05 +00:00
parent 6524635a26
commit 1fb7433c29
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/EnumHelper.h
+8 -2
View File
@@ -55,7 +55,10 @@ static void CheckXToStringParamType( const char **p ) { }
static auto_ptr<CString> as_##X##Name[CNT]; \ static auto_ptr<CString> as_##X##Name[CNT]; \
if( as_##X##Name[0].get() == NULL ) { \ if( as_##X##Name[0].get() == NULL ) { \
for( unsigned i = 0; i < CNT; ++i ) \ for( unsigned i = 0; i < CNT; ++i ) \
as_##X##Name[i] = auto_ptr<CString> ( new CString( X##Names[i] ) ); \ { \
auto_ptr<CString> ap( new CString( X##Names[i] ) ); \
as_##X##Name[i] = ap; \
} \
} \ } \
ASSERT( CNT == ARRAYSIZE(X##Names) ); \ ASSERT( CNT == ARRAYSIZE(X##Names) ); \
if( x == CNT+1 ) \ if( x == CNT+1 ) \
@@ -83,7 +86,10 @@ static void CheckXToStringParamType( const char **p ) { }
static auto_ptr<LocalizedString> g_##X##Name[NUM_##X]; \ static auto_ptr<LocalizedString> g_##X##Name[NUM_##X]; \
if( g_##X##Name[0].get() == NULL ) { \ if( g_##X##Name[0].get() == NULL ) { \
for( unsigned i = 0; i < NUM_##X; ++i ) \ for( unsigned i = 0; i < NUM_##X; ++i ) \
g_##X##Name[i] = auto_ptr<LocalizedString> ( new LocalizedString(#X, X##ToString((X)i)) ); \ { \
auto_ptr<LocalizedString> ap( new LocalizedString(#X, X##ToString((X)i)) ); \
g_##X##Name[i] = ap; \
} \
} \ } \
return g_##X##Name[x]->GetValue(); \ return g_##X##Name[x]->GetValue(); \
} }