Change the order of compiler checks in assume_aligned

Testing to see if this works around issues with MSVC builds

1 files changed, 7 insertions, 5 deletions

diff --git a/common/opthelpers.h b/common/opthelpers.h
index 04c5f1d0..0f05dc3c 100644
--- a/common/opthelpers.h
+++ b/common/opthelpers.h
@@ -58,15 +58,17 @@ force_inline constexpr auto assume_aligned(T *ptr) noexcept
     return std::assume_aligned<alignment,T>(ptr);
 #elif HAS_BUILTIN(__builtin_assume_aligned)
     return static_cast<T*>(__builtin_assume_aligned(ptr, alignment));
-#elif defined(__ICC)
-    __assume_aligned(ptr, alignment);
-    return ptr;
-#else
+#elif defined(_MSC_VER)
     constexpr std::size_t alignment_mask{(1<<alignment) - 1};
     if((reinterpret_cast<std::uintptr_t>(ptr)&alignment_mask) == 0)
         return ptr;
     unreachable();
-#endif
+#elif defined(__ICC)
+    __assume_aligned(ptr, alignment);
+    return ptr;
+ #else
+    return ptr;
+ #endif
 }
 
 } // namespace al