X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62b88de2d21cdaa9d61fc4c8737eb4e58584bba1..e733c4ce1e24cf7e4b0b0d8362fc59aaa7a7641c:/tests/any/anytest.cpp?ds=sidebyside diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp index dc5fb4a7c8..2b36e3bb38 100644 --- a/tests/any/anytest.cpp +++ b/tests/any/anytest.cpp @@ -2,7 +2,6 @@ // Name: tests/any/anytest.cpp // Purpose: Test the wxAny classes // Author: Jaakko Salli -// RCS-ID: $Id$ // Copyright: (c) the wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -37,15 +36,10 @@ private: CPPUNIT_TEST( Equality ); CPPUNIT_TEST( As ); CPPUNIT_TEST( GetAs ); - // FIXME: One of these tests might result in heap corruption under PPC - // OS X, disable them to at least allow the subsequent tests to - // run as otherwise the test program just crashes. -#ifdef __WXOSX__ CPPUNIT_TEST( Null ); CPPUNIT_TEST( wxVariantConversions ); CPPUNIT_TEST( CustomTemplateSpecialization ); CPPUNIT_TEST( Misc ); -#endif // __WXOSX__ CPPUNIT_TEST_SUITE_END(); void CheckType(); @@ -408,7 +402,7 @@ void wxAnyTestCase::GetAs() res = m_anyDoubleDouble1.GetAs(&s); CPPUNIT_ASSERT(res); double d2; - res = s.ToDouble(&d2); + res = s.ToCDouble(&d2); CPPUNIT_ASSERT(res); CPPUNIT_ASSERT_DOUBLES_EQUAL(d2, TEST_FLOAT_CONST, FEQ_DELTA); }