wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-19 11:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/manual_lexer

Browse Source
This commit is contained in:
Niels Lohmann committed 2017-03-31 23:58:45 +02:00
2 parents 3fa0610856 d07596a0ea
commit 8d393b5eff
2 files changed
+8 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/json.hpp
+3
View File
@@ -13795,6 +13795,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