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.

To fix compilation issue for intel OSX compiler
4b55f0eb · Kyle Thompson · c90bf5e0 · 4b55f0eb
Commit 4b55f0eb authored Aug 08, 2017 by Kyle Thompson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

json.hpp src/json.hpp +3 -3

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -7526,10 +7526,10 @@ class basic_json
        result["platform"] = "unknown";
 #endif
-#if defined(__clang__)
+#if defined(__ICC) || defined(__INTEL_COMPILER)
-        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
-#elif 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)