From e042c3b582a4d707b366ba2594b31305892fed6f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 5 Apr 2011 22:29:58 +0000 Subject: [PATCH] Don't do anything in WX_ASSERT_FAILS_WITH_ASSERT when wxDEBUG_LEVEL==0. We can't test for assert failure when using a build of wxWidgets in which asserts don't exist at all. Closes #13119. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/testprec.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/testprec.h b/tests/testprec.h index e45b48bb10..d956d4353a 100644 --- a/tests/testprec.h +++ b/tests/testprec.h @@ -85,8 +85,12 @@ public: CPPUNIT_FAIL("expected assertion not generated"); \ } #else - // there are no assertions in this build so just check that it fails - #define WX_ASSERT_FAILS_WITH_ASSERT(cond) CPPUNIT_ASSERT(!(cond)) + // there are no assertions in this build so we can't do anything (we used + // to check that the condition failed but this didn't work well as in + // normal build with wxDEBUG_LEVEL != 0 we can pass something not + // evaluating to a bool at all but it then would fail to compile in + // wxDEBUG_LEVEL == 0 case, so just don't do anything at all now). + #define WX_ASSERT_FAILS_WITH_ASSERT(cond) #endif // these functions can be used to hook into wxApp event processing and are