wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-14 10:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Report the right __cplusplus value for MSVC in basic_json meta()

* Run amalgamate
This commit is contained in:
flagarde authored and GitHub committed 2022-04-04 20:45:19 +02:00
1 parent 33b75e513a
commit ab5cecb34f
2 files changed
+8 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

single_include/nlohmann/json.hpp
+4 -1
View File
@@ -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";