From 64e941edd4c6ff84e75e98ec551c42096f31ec77 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Mon, 28 Aug 2006 12:27:39 +0000 Subject: [PATCH] We can't define things in someone else's namespace. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/testprec.h | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/tests/testprec.h b/tests/testprec.h index 1ec2054d6b..b1799321f1 100644 --- a/tests/testprec.h +++ b/tests/testprec.h @@ -1,32 +1,4 @@ #include "wx/wxprec.h" - -#include - -// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxString objects -// -// NB: at least for VC7.1 the specialization must be done before cppunit -// headers inclusion as otherwise it's just ignored! -namespace CppUnit -{ - -template struct assertion_traits; - -template <> -struct assertion_traits -{ - static bool equal(const wxString& s1, const wxString& s2) - { - return s1 == s2; - } - - static std::string toString(const wxString& s) - { - return std::string(s.mb_str()); - } -}; - -} // namespace CppUnit - #include "wx/cppunit.h" // define wxHAVE_U_ESCAPE if the compiler supports \uxxxx character constants @@ -34,7 +6,3 @@ struct assertion_traits (defined(__GNUC__) && (__GNUC__ >= 3)) #define wxHAVE_U_ESCAPE #endif - -#define CPPUNIT_ASSERT_STR_EQUAL(s1, s2) \ - CPPUNIT_ASSERT_EQUAL( wxString(s1), wxString(s2) ) - -- 2.45.2