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

Intel C++ Compiler preprocessor guard for #pragma intrinsic - diyfp.h
Tencent · Jun 28, 2017 · 2f45319 · 2f45319
2 parents 77ae0b9 + 294ad93
commit 2f45319
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)