From be789bea5987eb119fcba6ff8a0d2879a1ecfece Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Mon, 2 Apr 2018 03:27:07 +0200 Subject: [PATCH] Fix funny problem with C header stdbool.h ...which is so kind as to redefine bool, true and false as macros. Yessss! --- src/lib/error.hpp | 2 + .../proc/mobject/placement-hierarchy-test.cpp | 2 +- wiki/thinkPad.ichthyo.mm | 38 ++++++++++++------- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/lib/error.hpp b/src/lib/error.hpp index 0fd596e62..06fa5ab19 100644 --- a/src/lib/error.hpp +++ b/src/lib/error.hpp @@ -39,6 +39,8 @@ #ifndef LUMIERA_ERROR_HPP_ #define LUMIERA_ERROR_HPP_ +#define _STDBOOL_H // prevent from including stdbool.h + #include "include/logging.h" #include "include/lifecycle.h" #include "lib/error.h" diff --git a/tests/core/proc/mobject/placement-hierarchy-test.cpp b/tests/core/proc/mobject/placement-hierarchy-test.cpp index 785d4f2f4..1c83f1cb3 100644 --- a/tests/core/proc/mobject/placement-hierarchy-test.cpp +++ b/tests/core/proc/mobject/placement-hierarchy-test.cpp @@ -151,9 +151,9 @@ namespace test { CHECK (2 == pClip.use_count()); CHECK (2 == pSub1.use_count()); +#if false ///////////////////////////////////////////////////////////////////////////////TODO: find a way to configure NoBug to throw in case of assertion ///////////////////////////////////////////////////////////////////////////////TODO: configure NoBug specifically for the testsuite -#ifdef false VERIFY_ERROR (ASSERTION, hijacked->specialAPI() ); #endif diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 61ee974b6..016499c03 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -26919,7 +26919,7 @@ - + @@ -28107,6 +28107,9 @@ + + + @@ -28326,11 +28329,11 @@ - - + + - + @@ -28504,7 +28507,7 @@ - + @@ -28516,7 +28519,7 @@ - + @@ -28558,7 +28561,7 @@ - + @@ -28608,10 +28611,10 @@ - - - - + + + + @@ -28619,8 +28622,17 @@ - - + + + + + + + + + + +