Merge pull request #744 from peastman/master

Workaround for compiler bug in Visual Studio

Merge pull request #744 from peastman/master
Workaround for compiler bug in Visual Studio
066cdd60 · peastman · 12dbd216 · a55b34ee · 066cdd60
Commit 066cdd60 authored Nov 26, 2014 by peastman
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

platforms/cpu/src/CpuNonbondedForceVec8.cpp platforms/cpu/src/CpuNonbondedForceVec8.cpp +6 -0

No files found.
--- a/platforms/cpu/src/CpuNonbondedForceVec8.cpp
+++ b/platforms/cpu/src/CpuNonbondedForceVec8.cpp
@@ -31,6 +31,12 @@
 using namespace std;
 using namespace OpenMM;

+#ifdef _MSC_VER
+    // Workaround for a compiler bug in Visual Studio 10. Hopefully we can remove this
+    // once we move to a later version.
+    #undef __AVX__
+#endif
+
 #ifndef __AVX__
 bool isVec8Supported() {
    return false;