mirror of
https://github.com/nlohmann/json.git
synced 2024-08-23 21:42:29 +02:00
Merge pull request #682 from kbthomp1/fix-intel-osx
To fix compilation issue for intel OSX compiler
This commit is contained in:
commit
6e5b895f87
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue