amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-03-29 20:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix global UDLs (#3646)

Browse Source 
* Add ci_test_noglobaludls to CI

* Really default JSON_GLOBAL_UDLS to 1

* Test global UDLs

* Suppress warnings

* Clarify documentation
This commit is contained in:
Florian Albrechtskirchinger
2022-08-01 22:42:35 +02:00
committed by GitHub
parent 817a4a2117
commit cbaf1033be
19 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/macro_scope.hpp
View File

@@ -464,5 +464,5 @@
#endif
#ifndef JSON_USE_GLOBAL_UDLS
#define JSON_USE_GLOBAL_UDLS 0
#define JSON_USE_GLOBAL_UDLS 1
#endif

3
include/nlohmann/json.hpp
View File

@@ -5154,7 +5154,8 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC
} // namespace std
#if JSON_USE_GLOBAL_UDLS
using namespace nlohmann::literals::json_literals; // NOLINT(build/namespaces_literals)
using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
#endif
#include <nlohmann/detail/macro_unscope.hpp>