From ab44a50d984aeec2819230e3ce1b9a9cb0867ee0 Mon Sep 17 00:00:00 2001 From: traits Date: Mon, 7 Aug 2017 14:23:48 +0200 Subject: [PATCH 1/2] Digraph warning The original version can trigger a digraph-related warning in VS2015. Is this namespace construct a typo or something deliberate? --- src/json.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json.hpp b/src/json.hpp index e20ab71d..9a04a62b 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -14492,7 +14492,7 @@ struct hash /// specialization for std::less template<> -struct less<::nlohmann::detail::value_t> +struct less { /*! @brief compare two value_t enum values From 54c67dcfec158324201a8db84a423e2ba3b7c507 Mon Sep 17 00:00:00 2001 From: traits Date: Thu, 10 Aug 2017 09:05:00 +0200 Subject: [PATCH 2/2] Update json.hpp --- src/json.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/json.hpp b/src/json.hpp index 9a04a62b..efd76da7 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -14492,7 +14492,8 @@ struct hash /// specialization for std::less template<> -struct less +struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', + // see https://github.com/nlohmann/json/pull/679 { /*! @brief compare two value_t enum values