j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #540 from tinloaf/diagnostics

Browse source 
Properly pop diagnostics
This commit is contained in:
Niels Lohmann 2017-03-30 17:25:29 +02:00 committed by GitHub
commit 7881783745
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/json.hpp
View file

@ -13886,6 +13886,9 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#if defined(__clang__)
#pragma GCC diagnostic pop
#endif
// clean up // clean up
#undef JSON_CATCH #undef JSON_CATCH

3
src/json.hpp.re2c
View file

@ -12919,6 +12919,9 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#if defined(__clang__)
#pragma GCC diagnostic pop
#endif
// clean up // clean up
#undef JSON_CATCH #undef JSON_CATCH