mirror of
https://github.com/nlohmann/json.git
synced 2025-07-28 12:02:00 +03:00
To fix compilation issue for intel OSX compiler
o To prevent the compilation issue on OSX with the intel compiler suite. The error was found with icpc version 15.0.3.187 where the "__clang_version__" was not defined correctly, while "__clang__" was.
This commit is contained in:
@ -7526,10 +7526,10 @@ class basic_json
|
||||
result["platform"] = "unknown";
|
||||
#endif
|
||||
|
||||
#if defined(__clang__)
|
||||
result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
|
||||
#elif defined(__ICC) || defined(__INTEL_COMPILER)
|
||||
#if defined(__ICC) || defined(__INTEL_COMPILER)
|
||||
result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
|
||||
#elif defined(__clang__)
|
||||
result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
|
||||
#elif defined(__GNUC__) || defined(__GNUG__)
|
||||
result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
|
||||
#elif defined(__HP_cc) || defined(__HP_aCC)
|
||||
|
Reference in New Issue
Block a user