Skip to content

J
json
Commit 78817837 by Niels Lohmann Committed by GitHub
Options

Merge pull request #540 from tinloaf/diagnostics

Properly pop diagnostics
parents c2e80a72 0b1b6307
Showing with 6 additions and 0 deletions
src/json.hpp
...@@ -13886,6 +13886,9 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std ...@@ -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
......
src/json.hpp.re2c
...@@ -12919,6 +12919,9 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment