From 4b55f0ebd6c95e61364a29caae9743aed30b5d93 Mon Sep 17 00:00:00 2001 From: Kyle Thompson Date: Tue, 8 Aug 2017 18:43:03 -0400 Subject: [PATCH] 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. --- src/json.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index e20ab71d41..5bb8b31a32 100644 --- 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)