amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-10 00:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #540 from tinloaf/diagnostics

Browse Source 
Properly pop diagnostics
This commit is contained in:
Niels Lohmann authored and GitHub committed 2017-03-30 17:25:29 +02:00
2 parents c2e80a72d7 0b1b6307a5
commit 7881783745
2 files changed
+6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/json.hpp
+3
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__)
#pragma GCC diagnostic pop
#endif
#if defined(__clang__)
#pragma GCC diagnostic pop
#endif
// clean up
#undef JSON_CATCH
src/json.hpp.re2c
+3
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__)
#pragma GCC diagnostic pop
#endif
#if defined(__clang__)
#pragma GCC diagnostic pop
#endif
// clean up
#undef JSON_CATCH