Report the right __cplusplus value for MSVC in basic_json meta() (#3417)

* Report the right __cplusplus value for MSVC in basic_json meta() * Run amalgamate
nlohmann · Apr 4, 2022 · ab5cecb · ab5cecb
1 parent 33b75e5
commit ab5cecb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
@@ -310,7 +310,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
  result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
 #endif
 
-#ifdef __cplusplus
+
+#if defined(_MSVC_LANG)
+ result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
+#elif defined(__cplusplus)
  result["compiler"]["c++"] = std::to_string(__cplusplus);
 #else
  result["compiler"]["c++"] = "unknown";

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -17505,7 +17505,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
  result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
 #endif
 
-#ifdef __cplusplus
+
+#if defined(_MSVC_LANG)
+ result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
+#elif defined(__cplusplus)
  result["compiler"]["c++"] = std::to_string(__cplusplus);
 #else
  result["compiler"]["c++"] = "unknown";