Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix name clashes with the bundled rapidjson. Fixes #534. #604

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix name clashes with the bundled rapidjson. Fixes #534. #604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions include/cereal/archives/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ namespace cereal
{ RapidJSONException( const char * what_ ) : Exception( what_ ) {} };
}

// Avoid the bundled rapidjson to have name clashes with regular rapidjson
#define CEREAL_RAPIDJSON_NAMESPACE cereal::rapidjson
#define CEREAL_RAPIDJSON_NAMESPACE_BEGIN namespace cereal { namespace rapidjson {
#define CEREAL_RAPIDJSON_NAMESPACE_END } }

// Inform rapidjson that assert will throw
#ifndef CEREAL_RAPIDJSON_ASSERT_THROWS
#define CEREAL_RAPIDJSON_ASSERT_THROWS
Expand Down