From 025f4cea424e9c9bb5e942307387aee463c2865a Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 1 Jul 2019 22:29:21 +0200 Subject: [PATCH] :rotating_light: fix warning --- Makefile | 2 +- include/nlohmann/thirdparty/hedley/hedley_undef.hpp | 1 - single_include/nlohmann/json.hpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 141e1c78..011c7c4d 100644 --- a/Makefile +++ b/Makefile @@ -621,5 +621,5 @@ update_hedley: 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 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 diff --git a/include/nlohmann/thirdparty/hedley/hedley_undef.hpp b/include/nlohmann/thirdparty/hedley/hedley_undef.hpp index 5458f064..5e95ae5a 100644 --- a/include/nlohmann/thirdparty/hedley/hedley_undef.hpp +++ b/include/nlohmann/thirdparty/hedley/hedley_undef.hpp @@ -119,4 +119,3 @@ #undef NLOHMANN_JSON_HEDLEY_VERSION_ENCODE #undef NLOHMANN_JSON_HEDLEY_WARNING #undef NLOHMANN_JSON_HEDLEY_WARN_UNUSED_RESULT -#undef NLOHMANN_JSON_HEDLEY__IS_CONSTEXPR diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 73a53ffb..6778fd41 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -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_WARNING #undef NLOHMANN_JSON_HEDLEY_WARN_UNUSED_RESULT -#undef NLOHMANN_JSON_HEDLEY__IS_CONSTEXPR