Skip to content

Commit 091de04

Browse files
authored
Merge pull request Tencent#1462 from ra1u/master
Allow user to define custom RAPIDJSON_NOEXCEPT_ASSERT macro
2 parents 3cf4f7c + 40cae03 commit 091de04

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

include/rapidjson/rapidjson.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,7 @@ RAPIDJSON_NAMESPACE_END
607607
///////////////////////////////////////////////////////////////////////////////
608608
// RAPIDJSON_NOEXCEPT_ASSERT
609609

610+
#ifndef RAPIDJSON_NOEXCEPT_ASSERT
610611
#ifdef RAPIDJSON_ASSERT_THROWS
611612
#if RAPIDJSON_HAS_CXX11_NOEXCEPT
612613
#define RAPIDJSON_NOEXCEPT_ASSERT(x)
@@ -616,6 +617,7 @@ RAPIDJSON_NAMESPACE_END
616617
#else
617618
#define RAPIDJSON_NOEXCEPT_ASSERT(x) RAPIDJSON_ASSERT(x)
618619
#endif // RAPIDJSON_ASSERT_THROWS
620+
#endif // RAPIDJSON_NOEXCEPT_ASSERT
619621

620622
///////////////////////////////////////////////////////////////////////////////
621623
// new/delete

0 commit comments

Comments
 (0)