Merge pull request #682 from kbthomp1/fix-intel-osx

To fix compilation issue for intel OSX compiler
nlohmann · Aug 9, 2017 · 6e5b895 · 6e5b895
2 parents c90bf5e + 4b55f0e
commit 6e5b895
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/json.hpp b/src/json.hpp
@@ -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)