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

Fix HP compiler detection in JSON meta

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

6
include/nlohmann/json.hpp
View File

@ -281,8 +281,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
std::to_string(__GNUC_PATCHLEVEL__))
}
};
#elif defined(__HP_cc) || defined(__HP_aCC)
result["compiler"] = "hp"
#elif defined(__HP_aCC)
result["compiler"] = {{"family", "hp"}, {"version", __HP_aCC}};
#elif defined(__HP_cc)
result["compiler"] = {{"family", "hp"}, {"version", __HP_cc}};
#elif defined(__IBMCPP__)
result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
#elif defined(_MSC_VER)

6
single_include/nlohmann/json.hpp
View File

@ -19292,8 +19292,10 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
std::to_string(__GNUC_PATCHLEVEL__))
}
};
#elif defined(__HP_cc) || defined(__HP_aCC)
result["compiler"] = "hp"
#elif defined(__HP_aCC)
result["compiler"] = {{"family", "hp"}, {"version", __HP_aCC}};
#elif defined(__HP_cc)
result["compiler"] = {{"family", "hp"}, {"version", __HP_cc}};
#elif defined(__IBMCPP__)
result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
#elif defined(_MSC_VER)