From 99119b0e8532793ff045ba965e58634581a51f12 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 12 May 2013 23:04:13 +0000 Subject: [PATCH] Whack-a-mole with wxOSX/PPC unit tests continued. The problem was not related to float-to-double conversions in wxAny code, try to narrow it even further. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/any/anytest.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp index c746c30e5b..2a2c0bab9d 100644 --- a/tests/any/anytest.cpp +++ b/tests/any/anytest.cpp @@ -313,17 +313,10 @@ void wxAnyTestCase::GetAs() short int si = 0; unsigned long ul = 0; wxString s; -#if defined(__POWERPC__) - // FIXME: under wxOSX using float instead of double results in the heap - // corruption, at least in the builds under PPC architecture for - // some reason, disable them temporarily until this can be found. - double f = 0.0; -#else // Let's test against float instead of double, since the former // is not the native underlying type the code converts to, but // should still work, all the same. float f = 0.0; -#endif bool b = false; // Conversions from signed long type @@ -363,7 +356,11 @@ void wxAnyTestCase::GetAs() // should not work. CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&l)); CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&ul)); + // FIXME: This statement results in heap corruption in wxOSX/PPC builds + // for some unknown reason. +#if !defined(__WXOSX__) || !defined(__POWERPC__) CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&f)); +#endif // OSX/PPC CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&b)); // Let's test some other conversions from string that should work. -- 2.45.2