Merge branch 'test-matrix' of github.com:psteinb/compass into test-matrix

a45b6113 · steinbac · eaecd8f3 · 3f6838a3 · a45b6113
Commit a45b6113 authored Apr 13, 2018 by steinbac
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

include/detail/rt/x86/cpuid_common.hpp include/detail/rt/x86/cpuid_common.hpp +2 -1

No files found.
--- a/include/detail/rt/x86/cpuid_common.hpp
+++ b/include/detail/rt/x86/cpuid_common.hpp
 #ifndef COMPASS_X86_CPUID_COMMON_H
 #define COMPASS_X86_CPUID_COMMON_H

+#ifndef COMPASS_CT_COMP_MSVC
 #include "cpuid.h"

 namespace compass {
@@ -39,5 +40,5 @@ namespace compass {
  }; // runtime

 }; //compass
-
+#endif /* COMPASS_CT_COMP_MSVC */
 #endif /* COMPASS_X86_CPUID_COMMON_H */