Don't #include ciso646 for MSVC as it contains '#define and &&' and s…

…imilar
STEllAR-GROUP · Jan 30, 2018 · ff49251 · ff49251
1 parent dbc085f
commit ff49251
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/hpx/config/compiler_native_tls.hpp b/hpx/config/compiler_native_tls.hpp
@@ -8,7 +8,10 @@
 
 #include <hpx/config/defines.hpp>
 
+// don't #include ciso646 for MSVC as it contains '#define and &&' and similar
+#if !defined(_MSC_VER)
 #include <ciso646>
+#endif
 
 #if defined(__has_feature)
 #  if __has_feature(cxx_thread_local)