X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dddc2bc23ce15ef03847f173c464fc5005a4278c..5f9e369af0c834bbde0f7f5d2047abd736967f58:/tests/any/anytest.cpp?ds=sidebyside diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp index 0d86acaf73..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 /////////////////////////////////////////////////////////////////////////////// @@ -306,14 +305,6 @@ void wxAnyTestCase::Null() void wxAnyTestCase::GetAs() { - // FIXME: Parts of this test result in heap corruption in wxOSX/PPC builds - // for some unknown reason, disable them to at least allow running - // the other tests. -#if defined(__WXOSX__) && defined(__POWERPC__) - #warning "Disabling some tests under PPC, please consider debugging them." - #define wxDONT_TEST -#endif // OSX/PPC - // // Test dynamic conversion bool res; @@ -364,12 +355,9 @@ void wxAnyTestCase::GetAs() // should not work. CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&l)); CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&ul)); -#ifndef wxDONT_TEST CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&f)); -#endif // !wxDONT_TEST CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&b)); -#ifndef wxDONT_TEST // Let's test some other conversions from string that should work. wxAny anyString; @@ -403,7 +391,6 @@ void wxAnyTestCase::GetAs() CPPUNIT_ASSERT(res); CPPUNIT_ASSERT(s == "true"); CPPUNIT_ASSERT(!m_anyBool1.GetAs(&f)); -#endif // !wxDONT_TEST // Conversions from floating point type res = m_anyDoubleDouble1.GetAs(&l); @@ -415,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); }