From d48290e387932ba016fb1d0117ac4b71edda45ae Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Sat, 13 Jan 2018 12:51:24 +0800 Subject: [PATCH] Another try to fix travis build --- test/unittest/namespacetest.cpp | 4 ---- test/unittest/unittest.h | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/unittest/namespacetest.cpp b/test/unittest/namespacetest.cpp index 9f5c9af..1814724 100644 --- a/test/unittest/namespacetest.cpp +++ b/test/unittest/namespacetest.cpp @@ -12,10 +12,6 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. -// Not throwing exception for this test -#include -#define RAPIDJSON_ASSERT(x) assert(x) - #include "unittest.h" // test another instantiation of RapidJSON in a different namespace diff --git a/test/unittest/unittest.h b/test/unittest/unittest.h index 4b1c293..84c1b73 100644 --- a/test/unittest/unittest.h +++ b/test/unittest/unittest.h @@ -117,6 +117,9 @@ public: #pragma GCC diagnostic pop #endif +// Not using noexcept for testing RAPIDJSON_ASSERT() +#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0 + #ifndef RAPIDJSON_ASSERT #define RAPIDJSON_ASSERT(x) (!(x) ? throw AssertException(RAPIDJSON_STRINGIFY(x)) : (void)0u) #endif