From 40aff4182f6e2b11bc8b0525aa965b7b261b3124 Mon Sep 17 00:00:00 2001 From: Lukas Barth Date: Thu, 30 Mar 2017 16:10:03 +0200 Subject: [PATCH 1/2] Pop for every push --- src/json.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/json.hpp b/src/json.hpp index 3345cf2d..90a48538 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -13886,6 +13886,9 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) #pragma GCC diagnostic pop #endif +#if defined(__clang__) + #pragma GCC diagnostic pop +#endif // clean up #undef JSON_CATCH From 0b1b6307a52bc5347589f1c41c79f368ca7c1057 Mon Sep 17 00:00:00 2001 From: Lukas Barth Date: Thu, 30 Mar 2017 16:14:02 +0200 Subject: [PATCH 2/2] Also change the re2c file --- src/json.hpp.re2c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 60bb63c6..d88830b9 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -12919,6 +12919,9 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) #pragma GCC diagnostic pop #endif +#if defined(__clang__) + #pragma GCC diagnostic pop +#endif // clean up #undef JSON_CATCH