From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Sat, 19 Sep 2009 10:13:31 +0000 (+0000)
Subject: Fixed wxAny tests for VC6
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9ae96ec2bd00c577fdcd9392f81e232fee5b44bb

Fixed wxAny tests for VC6

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index 4b05691644..5e6252b49e 100644
--- a/tests/any/anytest.cpp
+++ b/tests/any/anytest.cpp
@@ -181,8 +181,9 @@ void wxAnyTestCase::Equality()
     CPPUNIT_ASSERT_DOUBLES_EQUAL(wxANY_AS(m_anyFloatDouble1, double),
                                  TEST_FLOAT_CONST,
                                  FEQ_DELTA);
-    CPPUNIT_ASSERT(m_anyWxObjectPtr1.As<wxObject*>() == dummyWxObjectPointer);
-    CPPUNIT_ASSERT(m_anyVoidPtr1.As<void*>() == dummyVoidPointer);
+    CPPUNIT_ASSERT(wxANY_AS(m_anyWxObjectPtr1, wxObject*)
+                        == dummyWxObjectPointer);
+    CPPUNIT_ASSERT(wxANY_AS(m_anyVoidPtr1, void*) == dummyVoidPointer);
 
     CPPUNIT_ASSERT(m_anySignedLong2 == 15);
     CPPUNIT_ASSERT(m_anyStringString2 == wxString("abc"));
@@ -195,8 +196,9 @@ void wxAnyTestCase::Equality()
     CPPUNIT_ASSERT_DOUBLES_EQUAL(wxANY_AS(m_anyFloatDouble2, double),
                                  TEST_FLOAT_CONST,
                                  FEQ_DELTA);
-    CPPUNIT_ASSERT(m_anyWxObjectPtr2.As<wxObject*>() == dummyWxObjectPointer);
-    CPPUNIT_ASSERT(m_anyVoidPtr2.As<void*>() == dummyVoidPointer);
+    CPPUNIT_ASSERT(wxANY_AS(m_anyWxObjectPtr2, wxObject*)
+                        == dummyWxObjectPointer);
+    CPPUNIT_ASSERT(wxANY_AS(m_anyVoidPtr2, void*) == dummyVoidPointer);
 }
 
 void wxAnyTestCase::As()