X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39489697a3dea813ebd97ffde93236e8e4e4113a..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/tests/any/anytest.cpp

diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index ef12511425..29dd5170a9 100644
--- a/tests/any/anytest.cpp
+++ b/tests/any/anytest.cpp
@@ -306,14 +306,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,9 +356,7 @@ 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));
 
     // Let's test some other conversions from string that should work.
@@ -379,11 +369,9 @@ void wxAnyTestCase::GetAs()
     res = anyString.GetAs(&ul);
     CPPUNIT_ASSERT(res);
     CPPUNIT_ASSERT_EQUAL(ul, static_cast<unsigned long>(15));
-#ifndef wxDONT_TEST
     res = anyString.GetAs(&f);
     CPPUNIT_ASSERT(res);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(f, 15.0, FEQ_DELTA);
-#endif // !wxDONT_TEST
     anyString = "TRUE";
     res = anyString.GetAs(&b);
     CPPUNIT_ASSERT(res);
@@ -403,9 +391,7 @@ void wxAnyTestCase::GetAs()
     res = m_anyBool1.GetAs(&s);
     CPPUNIT_ASSERT(res);
     CPPUNIT_ASSERT(s == "true");
-#ifndef wxDONT_TEST
     CPPUNIT_ASSERT(!m_anyBool1.GetAs(&f));
-#endif // !wxDONT_TEST
 
     // Conversions from floating point type
     res = m_anyDoubleDouble1.GetAs(&l);
@@ -417,7 +403,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);
 }