Removed XTENSOR_CONSTEXPR_ENHANCED_STATIC

Author: JohanMabille

include/xtensor/containers/xfixed.hpp

@@ -365,9 +365,9 @@ namespace xt
 
         storage_type m_storage;
 
-        XTENSOR_CONSTEXPR_ENHANCED_STATIC inner_shape_type m_shape = S();
-        XTENSOR_CONSTEXPR_ENHANCED_STATIC inner_strides_type m_strides = get_strides<L, inner_strides_type>(S());
-        XTENSOR_CONSTEXPR_ENHANCED_STATIC inner_backstrides_type
+        constexpr static inner_shape_type m_shape = S();
+        constexpr static inner_strides_type m_strides = get_strides<L, inner_strides_type>(S());
+        constexpr static inner_backstrides_type
             m_backstrides = get_backstrides(m_shape, m_strides);
 
         storage_type& storage_impl() noexcept;
@@ -487,9 +487,9 @@ namespace xt
 
         container_closure_type m_storage;
 
-        XTENSOR_CONSTEXPR_ENHANCED_STATIC inner_shape_type m_shape = S();
-        XTENSOR_CONSTEXPR_ENHANCED_STATIC inner_strides_type m_strides = get_strides<L, inner_strides_type>(S());
-        XTENSOR_CONSTEXPR_ENHANCED_STATIC inner_backstrides_type
+        constexpr static inner_shape_type m_shape = S();
+        constexpr static inner_strides_type m_strides = get_strides<L, inner_strides_type>(S());
+        constexpr static inner_backstrides_type
             m_backstrides = get_backstrides(m_shape, m_strides);
 
         storage_type& storage_impl() noexcept;

include/xtensor/containers/xstorage.hpp

@@ -1728,7 +1728,7 @@ namespace xt
 
     private:
 
-        XTENSOR_CONSTEXPR_ENHANCED_STATIC cast_type m_array = cast_type({X...});
+        constexpr static cast_type m_array = cast_type({X...});
     };
 
 #undef XTENSOR_FIXED_SHAPE_CONSTEXPR

include/xtensor/core/xfunction.hpp

@@ -61,9 +61,9 @@ namespace xt
         template <std::size_t... N, class is_shape_trivial>
         struct xfunction_cache_impl<fixed_shape<N...>, is_shape_trivial>
         {
-            XTENSOR_CONSTEXPR_ENHANCED_STATIC fixed_shape<N...> shape = fixed_shape<N...>();
-            XTENSOR_CONSTEXPR_ENHANCED_STATIC bool is_trivial = is_shape_trivial::value;
-            XTENSOR_CONSTEXPR_ENHANCED_STATIC bool is_initialized = true;
+            constexpr static fixed_shape<N...> shape = fixed_shape<N...>();
+            constexpr static bool is_trivial = is_shape_trivial::value;
+            constexpr static bool is_initialized = true;
         };
 
         template <class... CT>