j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🚨 fix warning

Browse source
This commit is contained in:
Niels Lohmann 2019-07-01 22:29:21 +02:00
parent 897362191d
commit 025f4cea42
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -621,5 +621,5 @@ update_hedley:
rm -f include/nlohmann/thirdparty/hedley/hedley.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp rm -f include/nlohmann/thirdparty/hedley/hedley.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp
curl https://raw.githubusercontent.com/nemequ/hedley/master/hedley.h -o include/nlohmann/thirdparty/hedley/hedley.hpp curl https://raw.githubusercontent.com/nemequ/hedley/master/hedley.h -o include/nlohmann/thirdparty/hedley/hedley.hpp
gsed -i 's/HEDLEY_/NLOHMANN_JSON_HEDLEY_/g' include/nlohmann/thirdparty/hedley/hedley.hpp gsed -i 's/HEDLEY_/NLOHMANN_JSON_HEDLEY_/g' include/nlohmann/thirdparty/hedley/hedley.hpp
grep "[[:blank:]]*#[[:blank:]]*undef" include/nlohmann/thirdparty/hedley/hedley.hpp | sort | uniq | gsed 's/ //g' | gsed 's/undef/undef /g' > include/nlohmann/thirdparty/hedley/hedley_undef.hpp grep "[[:blank:]]*#[[:blank:]]*undef" include/nlohmann/thirdparty/hedley/hedley.hpp | grep -v "__" | sort | uniq | gsed 's/ //g' | gsed 's/undef/undef /g' > include/nlohmann/thirdparty/hedley/hedley_undef.hpp
$(MAKE) amalgamate $(MAKE) amalgamate

1
include/nlohmann/thirdparty/hedley/hedley_undef.hpp vendored
View file

@ -119,4 +119,3 @@
#undef NLOHMANN_JSON_HEDLEY_VERSION_ENCODE #undef NLOHMANN_JSON_HEDLEY_VERSION_ENCODE
#undef NLOHMANN_JSON_HEDLEY_WARNING #undef NLOHMANN_JSON_HEDLEY_WARNING
#undef NLOHMANN_JSON_HEDLEY_WARN_UNUSED_RESULT #undef NLOHMANN_JSON_HEDLEY_WARN_UNUSED_RESULT
#undef NLOHMANN_JSON_HEDLEY__IS_CONSTEXPR

1
single_include/nlohmann/json.hpp
View file

@ -22564,7 +22564,6 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#undef NLOHMANN_JSON_HEDLEY_VERSION_ENCODE #undef NLOHMANN_JSON_HEDLEY_VERSION_ENCODE
#undef NLOHMANN_JSON_HEDLEY_WARNING #undef NLOHMANN_JSON_HEDLEY_WARNING
#undef NLOHMANN_JSON_HEDLEY_WARN_UNUSED_RESULT #undef NLOHMANN_JSON_HEDLEY_WARN_UNUSED_RESULT
#undef NLOHMANN_JSON_HEDLEY__IS_CONSTEXPR