Fixed wxAny tests for VC6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -181,8 +181,9 @@ void wxAnyTestCase::Equality()
|
|||||||
CPPUNIT_ASSERT_DOUBLES_EQUAL(wxANY_AS(m_anyFloatDouble1, double),
|
CPPUNIT_ASSERT_DOUBLES_EQUAL(wxANY_AS(m_anyFloatDouble1, double),
|
||||||
TEST_FLOAT_CONST,
|
TEST_FLOAT_CONST,
|
||||||
FEQ_DELTA);
|
FEQ_DELTA);
|
||||||
CPPUNIT_ASSERT(m_anyWxObjectPtr1.As<wxObject*>() == dummyWxObjectPointer);
|
CPPUNIT_ASSERT(wxANY_AS(m_anyWxObjectPtr1, wxObject*)
|
||||||
CPPUNIT_ASSERT(m_anyVoidPtr1.As<void*>() == dummyVoidPointer);
|
== dummyWxObjectPointer);
|
||||||
|
CPPUNIT_ASSERT(wxANY_AS(m_anyVoidPtr1, void*) == dummyVoidPointer);
|
||||||
|
|
||||||
CPPUNIT_ASSERT(m_anySignedLong2 == 15);
|
CPPUNIT_ASSERT(m_anySignedLong2 == 15);
|
||||||
CPPUNIT_ASSERT(m_anyStringString2 == wxString("abc"));
|
CPPUNIT_ASSERT(m_anyStringString2 == wxString("abc"));
|
||||||
@@ -195,8 +196,9 @@ void wxAnyTestCase::Equality()
|
|||||||
CPPUNIT_ASSERT_DOUBLES_EQUAL(wxANY_AS(m_anyFloatDouble2, double),
|
CPPUNIT_ASSERT_DOUBLES_EQUAL(wxANY_AS(m_anyFloatDouble2, double),
|
||||||
TEST_FLOAT_CONST,
|
TEST_FLOAT_CONST,
|
||||||
FEQ_DELTA);
|
FEQ_DELTA);
|
||||||
CPPUNIT_ASSERT(m_anyWxObjectPtr2.As<wxObject*>() == dummyWxObjectPointer);
|
CPPUNIT_ASSERT(wxANY_AS(m_anyWxObjectPtr2, wxObject*)
|
||||||
CPPUNIT_ASSERT(m_anyVoidPtr2.As<void*>() == dummyVoidPointer);
|
== dummyWxObjectPointer);
|
||||||
|
CPPUNIT_ASSERT(wxANY_AS(m_anyVoidPtr2, void*) == dummyVoidPointer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxAnyTestCase::As()
|
void wxAnyTestCase::As()
|
||||||
|
Reference in New Issue
Block a user