Unifying

tdegeus · tdegeus · commit b06e22a7d3fd · 2020-09-08T12:36:22.000+02:00
diff --git a/include/xtensor/xarray.hpp b/include/xtensor/xarray.hpp
@@ -104,7 +104,7 @@ namespace xt
         using inner_backstrides_type = typename base_type::inner_backstrides_type;
         using temporary_type = typename semantic_base::temporary_type;
         using expression_tag = Tag;
-        static const std::size_t rank = SIZE_MAX;
+        constexpr static std::size_t rank = SIZE_MAX;
 
         xarray_container();
         explicit xarray_container(const shape_type& shape, layout_type l = L);
diff --git a/include/xtensor/xfixed.hpp b/include/xtensor/xfixed.hpp
@@ -313,7 +313,7 @@ namespace xt
         using expression_tag = Tag;
 
         constexpr static std::size_t N = std::tuple_size<shape_type>::value;
-        static const std::size_t rank = N;
+        constexpr static std::size_t rank = N;
 
         xfixed_container() = default;
         xfixed_container(const value_type& v);
diff --git a/include/xtensor/xtensor.hpp b/include/xtensor/xtensor.hpp
@@ -105,7 +105,7 @@ namespace xt
         using inner_strides_type = typename base_type::inner_strides_type;
         using temporary_type = typename semantic_base::temporary_type;
         using expression_tag = Tag;
-        static const std::size_t rank = N;
+        constexpr static std::size_t rank = N;
 
         xtensor_container();
         xtensor_container(nested_initializer_list_t<value_type, N> t);
diff --git a/include/xtensor/xview.hpp b/include/xtensor/xview.hpp
@@ -432,7 +432,7 @@ namespace xt
 
         using container_iterator = pointer;
         using const_container_iterator = const_pointer;
-        static const std::size_t rank = SIZE_MAX;
+        constexpr static std::size_t rank = SIZE_MAX;
 
         // The FSL argument prevents the compiler from calling this constructor
         // instead of the copy constructor when sizeof...(SL) == 0.
