External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add _MSC_FULL_VER to JSON meta

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2022-05-09 19:46:19 +02:00
parent 81c6ba3387
commit 146aebc77f
No known key found for this signature in database
GPG Key ID: 19618CE9B2D4BE6D
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nlohmann/json.hpp
View File

@ -288,7 +288,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
#elif defined(__IBMCPP__) #elif defined(__IBMCPP__)
result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}}; result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}}; result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}, {"version_full", _MSC_FULL_VER}};
#elif defined(__PGI) #elif defined(__PGI)
result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}}; result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
#elif defined(__SUNPRO_CC) #elif defined(__SUNPRO_CC)
@ -297,7 +297,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}}; result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
#endif #endif
#if defined(_MSVC_LANG) #if defined(_MSVC_LANG)
result["compiler"]["c++"] = std::to_string(_MSVC_LANG); result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
#elif defined(__cplusplus) #elif defined(__cplusplus)

3
single_include/nlohmann/json.hpp
View File

@ -19299,7 +19299,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
#elif defined(__IBMCPP__) #elif defined(__IBMCPP__)
result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}}; result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}}; result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}, {"version_full", _MSC_FULL_VER}};
#elif defined(__PGI) #elif defined(__PGI)
result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}}; result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
#elif defined(__SUNPRO_CC) #elif defined(__SUNPRO_CC)
@ -19308,7 +19308,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}}; result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
#endif #endif
#if defined(_MSVC_LANG) #if defined(_MSVC_LANG)
result["compiler"]["c++"] = std::to_string(_MSVC_LANG); result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
#elif defined(__cplusplus) #elif defined(__cplusplus)