Merge branch 'master' into fix-cmake-lapack-mpi-cuda

correaa · Sep 20, 2024 · fd55b5d · fd55b5d
2 parents ffafee1 + 4b85a5a
commit fd55b5d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/test/element_moved.cpp b/test/element_moved.cpp
@@ -6,10 +6,13 @@
 
 #include <boost/multi/array.hpp>  // for array, apply, array_types<>::ele...
 
-// // IWYU pragma: no_include <type_traits>  // for remove_reference<>::type
-// // IWYU pragma: no_include <map>
-// // IWYU pragma: no_include <set>
-// // IWYU pragma: no_include <stack>
+// IWYU pragma: no_include <type_traits>  // for remove_reference<>::type
+// IWYU pragma: no_include <map>
+// IWYU pragma: no_include <set>
+// IWYU pragma: no_include <stack>
+// IWYU pragma: no_include <algorithm>  // for fill_n
+// IWYU pragma: no_include <cstdlib>
+// IWYU pragma: no_include <pstl/glue_algorithm_defs.h>
 #include <utility>  // for move, swap
 #include <vector>   // for vector, operator==, vector<>::va...
 

diff --git a/test/layout.cpp b/test/layout.cpp
@@ -268,9 +268,9 @@ BOOST_AUTO_TEST_CASE(layout_AA) {
 	};
 
 #if defined(__cpp_lib_ranges) && (__cpp_lib_ranges >= 201911L)
-#if !defined(__clang_major__) || (__clang_major__ < 14) || (__clang_major__ != 10)
+#if !defined(__clang_major__) || ((__clang_major__ < 14) && (__clang_major__ != 10))
 #if !defined(__NVCC__)
-#if !defined(__MSVC)
+#if !defined(_MSC_VER)
 	static_assert( std::ranges::random_access_range<decltype(A2.extension())> );
 
 	auto tiA2 = std::views::transform(