Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We can't define things in someone else's namespace.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-08-28 12:27:39 +00:00
parent d49be4203e
commit 64e941edd4
1 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/testprec.h
View File

@@ -1,32 +1,4 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include <string>
// 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 <typename T> struct assertion_traits;
template <>
struct assertion_traits<wxString>
{
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" #include "wx/cppunit.h"
// define wxHAVE_U_ESCAPE if the compiler supports \uxxxx character constants // define wxHAVE_U_ESCAPE if the compiler supports \uxxxx character constants
@@ -34,7 +6,3 @@ struct assertion_traits<wxString>
(defined(__GNUC__) && (__GNUC__ >= 3)) (defined(__GNUC__) && (__GNUC__ >= 3))
#define wxHAVE_U_ESCAPE #define wxHAVE_U_ESCAPE
#endif #endif
#define CPPUNIT_ASSERT_STR_EQUAL(s1, s2) \
CPPUNIT_ASSERT_EQUAL( wxString(s1), wxString(s2) )