Fixed danmar#2360 (testrunner fails to build in Mac OS X Leopard (10.5) - assert macro vs assert method)

Pete Johns · Pete Johns · commit 58ddb3b0abd0 · 2010-12-28T09:32:36.000+11:00
Renamed assert to assert_.

Tested with gcc v4.0.1 on Snow Leopard.
diff --git a/test/testsuite.cpp b/test/testsuite.cpp
@@ -112,7 +112,7 @@ static std::string writestr(const std::string &str)
     return ostr.str();
 }
 
-void TestFixture::assert(const char *filename, int linenr, bool condition)
+void TestFixture::assert_(const char *filename, int linenr, bool condition)
 {
     if (!condition)
     {
diff --git a/test/testsuite.h b/test/testsuite.h
@@ -46,7 +46,7 @@ class TestFixture : public ErrorLogger
 
     bool runTest(const char testname[]);
 
-    void assert(const char *filename, int linenr, bool condition);
+    void assert_(const char *filename, int linenr, bool condition);
 
     void assertEquals(const char *filename, int linenr, const std::string &expected, const std::string &actual, const std::string &msg = "");
 
@@ -72,7 +72,7 @@ class TestFixture : public ErrorLogger
 };
 
 #define TEST_CASE( NAME )  if ( runTest(#NAME) ) { if (quiet_tests) { REDIRECT; NAME(); } else { NAME ();} }
-#define ASSERT( CONDITION )  assert(__FILE__, __LINE__, CONDITION)
+#define ASSERT( CONDITION )  assert_(__FILE__, __LINE__, CONDITION)
 #define ASSERT_EQUALS( EXPECTED , ACTUAL )  assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL)
 #define ASSERT_EQUALS_MSG( EXPECTED , ACTUAL, MSG )  assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL, MSG)
 #define ASSERT_THROW( CMD, EXCEPTION ) try { CMD ; assertThrowFail(__FILE__, __LINE__); } catch (EXCEPTION &) { } catch (...) { assertThrowFail(__FILE__, __LINE__); }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static std::string writestr(const std::string &str)`
`112`	`112`	`return ostr.str();`
`113`	`113`	`}`
`114`	`114`
`115`		`-void TestFixture::assert(const char *filename, int linenr, bool condition)`
	`115`	`+void TestFixture::assert_(const char *filename, int linenr, bool condition)`
`116`	`116`	`{`
`117`	`117`	`if (!condition)`
`118`	`118`	`{`