Merge pull request #1462 from ra1u/master

Allow user to define custom RAPIDJSON_NOEXCEPT_ASSERT macro
Tencent · Mar 11, 2019 · 091de04 · 091de04
2 parents 3cf4f7c + 40cae03
commit 091de04
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h
@@ -607,6 +607,7 @@ RAPIDJSON_NAMESPACE_END
 ///////////////////////////////////////////////////////////////////////////////
 // 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 @@ RAPIDJSON_NAMESPACE_END
 #else
 #define RAPIDJSON_NOEXCEPT_ASSERT(x) RAPIDJSON_ASSERT(x)
 #endif // RAPIDJSON_ASSERT_THROWS
+#endif // RAPIDJSON_NOEXCEPT_ASSERT
 
 ///////////////////////////////////////////////////////////////////////////////
 // new/delete