j3d1/json
1
0
Fork 0
Code Issues Pull requests 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
commit 8d393b5eff
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
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