Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid gcc warnings about missing braces in an aggregate initializer by not using a union in ToLongTestData

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-28 17:15:58 +00:00
parent ec3edcc984
commit efc5767138
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/strings/strings.cpp
View File

@@ -461,18 +461,20 @@ enum
static const struct ToLongData static const struct ToLongData
{ {
const wxChar *str; const wxChar *str;
union
{
#ifdef wxLongLong_t #ifdef wxLongLong_t
wxLongLong_t llvalue; wxLongLong_t value;
wxULongLong_t ullvalue; #else
long value;
#endif // wxLongLong_t #endif // wxLongLong_t
long lvalue;
unsigned long ulvalue;
};
int flags; int flags;
long LValue() const { return value; }
unsigned long ULValue() const { return value; }
#ifdef wxLongLong_t
wxLongLong_t LLValue() const { return value; }
wxULongLong_t ULLValue() const { return (wxULongLong_t)value; }
#endif // wxLongLong_t
bool IsOk() const { return !(flags & Number_Invalid); } bool IsOk() const { return !(flags & Number_Invalid); }
} longData[] = } longData[] =
{ {
@@ -509,7 +511,7 @@ void StringTestCase::ToLong()
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToLong(&l) ); CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToLong(&l) );
if ( ld.IsOk() ) if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.lvalue, l ); CPPUNIT_ASSERT_EQUAL( ld.LValue(), l );
} }
} }
@@ -525,7 +527,7 @@ void StringTestCase::ToULong()
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToULong(&ul) ); CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToULong(&ul) );
if ( ld.IsOk() ) if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.ulvalue, ul ); CPPUNIT_ASSERT_EQUAL( ld.ULValue(), ul );
} }
} }
@@ -543,7 +545,7 @@ void StringTestCase::ToLongLong()
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToLongLong(&l) ); CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToLongLong(&l) );
if ( ld.IsOk() ) if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.llvalue, l ); CPPUNIT_ASSERT_EQUAL( ld.LLValue(), l );
} }
} }
@@ -559,7 +561,7 @@ void StringTestCase::ToULongLong()
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToULongLong(&ul) ); CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToULongLong(&ul) );
if ( ld.IsOk() ) if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.ullvalue, ul ); CPPUNIT_ASSERT_EQUAL( ld.ULLValue(), ul );
} }
} }