remove tests for bool and {const,static,reinterpret}_cast in configure and wx/defs...

[wxWidgets.git] / include / wx / cppunit.h

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 51d0925e3fa468d169e9cda51bd8324b06b965a2..e9cfbdfd9f47d08cd66c2e36f71b7671bff5c2f1 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -122,7 +122,19 @@ assertEquals(int expected,
              CppUnit::SourceLine sourceLine,
              const std::string& message)
 {
-    assertEquals(unsigned long(expected), actual, sourceLine, message);
+    assertEquals((unsigned long)expected, actual, sourceLine, message);
+}
+
+// we also need this one to resolve ambiguity in the tests comparing unsigned
+// short (e.g. wxDateTime_t returned by several wxDateTime methods) with
+// literal integer constants
+inline void
+assertEquals(int expected,
+             unsigned short actual,
+             CppUnit::SourceLine sourceLine,
+             const std::string& message)
+{
+    assertEquals((unsigned short)expected, actual, sourceLine, message);
 }
 
 CPPUNIT_NS_END