Merge branch 'remove-explicit-dim-type-for-msvc' into 'master'

fixes See merge request correaa/boost-multi!1308
correaa · Dec 27, 2024 · 54b9100 · 54b9100
2 parents ef3466c + 411f7f4
commit 54b9100
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/include/boost/multi/adaptors/blas/numeric.hpp b/include/boost/multi/adaptors/blas/numeric.hpp
@@ -21,6 +21,7 @@
 // #include <boost/multi/adaptors/complex.hpp>
 
 #include <complex>                                           // for complex
+#include <cstddef>                                           // for nullptr_t
 #include <functional>                                        // for negate
 #include <iterator>                                          // for iterator...
 #include <memory>                                            // for pointer_...

diff --git a/include/boost/multi/array_ref.hpp b/include/boost/multi/array_ref.hpp
@@ -2544,7 +2544,7 @@ class const_subarray<T, 0, ElementPtr, Layout>
 template<typename T, typename ElementPtr, class Layout>
 struct const_subarray<T, 1, ElementPtr, Layout>  // NOLINT(fuchsia-multiple-inheritance) to define operators via CRTP
 	: multi::random_iterable<const_subarray<T, 1, ElementPtr, Layout> >
-	, array_types<T, ::boost::multi::dimensionality_type{1}, ElementPtr, Layout> {
+	, array_types<T, 1, ElementPtr, Layout> {
 	~const_subarray() = default;  // lints(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
 
 	// boost serialization needs `delete`. void boost::serialization::extended_type_info_typeid<T>::destroy(const void*) const [with T = boost::multi::subarray<double, 1, double*, boost::multi::layout_t<1> >]