From 347258c6c856614024683f19cf7e482bbf1f65f6 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Tue, 6 Jan 2026 16:32:16 +0200
Subject: [PATCH] When BOOST_UUID_NO_SIMD is defined, undef all other SIMD
 macros, because otherwise the configuration becomes inconsistent

---
 include/boost/uuid/detail/config.hpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/include/boost/uuid/detail/config.hpp b/include/boost/uuid/detail/config.hpp
index e67e86d..0d886ef 100644
--- a/include/boost/uuid/detail/config.hpp
+++ b/include/boost/uuid/detail/config.hpp
@@ -19,7 +19,18 @@
 #pragma once
 #endif
 
-#if !defined(BOOST_UUID_NO_SIMD)
+#if defined(BOOST_UUID_NO_SIMD)
+
+#undef BOOST_UUID_USE_SSE2
+#undef BOOST_UUID_USE_SSE3
+#undef BOOST_UUID_USE_SSSE3
+#undef BOOST_UUID_USE_SSE41
+#undef BOOST_UUID_USE_AVX
+#undef BOOST_UUID_USE_AVX2
+#undef BOOST_UUID_USE_AVX512_V1
+#undef BOOST_UUID_USE_AVX10_1
+
+#else
 
 #if defined(__GNUC__) && defined(__SSE2__)
 
@@ -121,6 +132,6 @@
 #define BOOST_UUID_NO_SIMD
 #endif
 
-#endif // !defined(BOOST_UUID_NO_SIMD)
+#endif // defined(BOOST_UUID_NO_SIMD)
 
 #endif // BOOST_UUID_DETAIL_CONFIG_HPP_INCLUDED_