commit 091de040edb3355dcf2f4a18c425aec51b906f08
author Milo Yip <miloyip@gmail.com> Mon Mar 11 10:35:27 2019 +0800
committer GitHub <noreply@github.com> Mon Mar 11 10:35:27 2019 +0800
tree 80a94b0182917595ead964bac7189c5def97c024
parent 3cf4f7c5a030e9a65b842d2e160ffee90df7613d
parent 40cae03b0d603b997edfddbc1daf44e5f7463036

Merge pull request #1462 from ra1u/master

Allow user to define custom RAPIDJSON_NOEXCEPT_ASSERT macro

include/rapidjson/rapidjson.h

diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h
index 065c8bb..549936f 100644
--- a/include/rapidjson/rapidjson.h
+++ b/include/rapidjson/rapidjson.h
@@ -607,6 +607,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_NOEXCEPT_ASSERT
 
+#ifndef RAPIDJSON_NOEXCEPT_ASSERT
 #ifdef RAPIDJSON_ASSERT_THROWS
 #if RAPIDJSON_HAS_CXX11_NOEXCEPT
 #define RAPIDJSON_NOEXCEPT_ASSERT(x)
@@ -616,6 +617,7 @@
 #else
 #define RAPIDJSON_NOEXCEPT_ASSERT(x) RAPIDJSON_ASSERT(x)
 #endif // RAPIDJSON_ASSERT_THROWS
+#endif // RAPIDJSON_NOEXCEPT_ASSERT
 
 ///////////////////////////////////////////////////////////////////////////////
 // new/delete