first round of debug/release merge: introduce wxDEBUG_LEVEL, for now defined as 1 if __WXDEBUG__ is defined, i.e. no real changes; don't use __WXDEBUG__ in the headers to keep debug and release builds ABI-compatible; add functions to customize or disable asserts handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
class TestAssertFailure { };
|
||||
|
||||
// macro to use for the functions which are supposed to fail an assertion
|
||||
#ifdef __WXDEBUG__
|
||||
#if wxDEBUG_LEVEL
|
||||
// some old cppunit versions don't define CPPUNIT_ASSERT_THROW so roll our
|
||||
// own
|
||||
#define WX_ASSERT_FAILS_WITH_ASSERT(cond) \
|
||||
@@ -23,7 +23,7 @@ class TestAssertFailure { };
|
||||
CPPUNIT_FAIL("expected assertion not generated"); \
|
||||
}
|
||||
#else
|
||||
// there are no assertions in non-debug build so just check that it fails
|
||||
// there are no assertions in this build so just check that it fails
|
||||
#define WX_ASSERT_FAILS_WITH_ASSERT(cond) CPPUNIT_ASSERT(!(cond))
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user