amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-03-16 05:56:00 +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
2017-03-31 23:58:45 +02:00
parent 3fa0610856 d07596a0ea
commit 8d393b5eff
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/json.hpp
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