Merge pull request #968 from TomaszNo/icc-preprocessor-guard

Intel C++ Compiler preprocessor guard for #pragma intrinsic - diyfp.h

Merge pull request #968 from TomaszNo/icc-preprocessor-guard
Intel C++ Compiler preprocessor guard for #pragma intrinsic - diyfp.h
2f45319b · Milo Yip · GitHub · 77ae0b97 · 294ad93e · 2f45319b
Commit 2f45319b authored Jun 28, 2017 by Milo Yip Committed by GitHub Jun 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

diyfp.h include/rapidjson/internal/diyfp.h +1 -1

No files found.
--- a/include/rapidjson/internal/diyfp.h
+++ b/include/rapidjson/internal/diyfp.h
@@ -21,7 +21,7 @@

 #include "../rapidjson.h"

-#if defined(_MSC_VER) && defined(_M_AMD64)
+#if defined(_MSC_VER) && defined(_M_AMD64) && !defined(__INTEL_COMPILER)
 #include <intrin.h>
 #pragma intrinsic(_BitScanReverse64)
 #pragma intrinsic(_umul128)