diff --git a/include/boost/numeric/ublas/matrix_expression.hpp b/include/boost/numeric/ublas/matrix_expression.hpp index ab9736b7..6d155051 100644 --- a/include/boost/numeric/ublas/matrix_expression.hpp +++ b/include/boost/numeric/ublas/matrix_expression.hpp @@ -202,7 +202,6 @@ namespace boost { namespace numeric { namespace ublas { BOOST_UBLAS_USING matrix_expression >::operator (); #endif typedef E expression_type; - typedef typename E::simd_category simd_category; typedef typename E::size_type size_type; typedef typename E::difference_type difference_type; typedef typename E::value_type value_type; @@ -213,7 +212,8 @@ namespace boost { namespace numeric { namespace ublas { typedef typename E::orientation_category orientation_category; typedef typename E::const_iterator1 const_iterator1_type; typedef typename E::const_iterator2 const_iterator2_type; - typedef unknown_storage_tag storage_category; + typedef typename E::storage_category storage_category; + typedef typename E::simd_category simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -345,7 +345,6 @@ namespace boost { namespace numeric { namespace ublas { BOOST_UBLAS_USING matrix_expression >::operator (); #endif typedef E expression_type; - typedef typename E::simd_category simd_category; typedef typename E::size_type size_type; typedef typename E::difference_type difference_type; typedef typename E::value_type value_type; @@ -384,7 +383,8 @@ namespace boost { namespace numeric { namespace ublas { typename E::const_iterator2, typename E::iterator2>::type iterator2_type; #endif - typedef unknown_storage_tag storage_category; + typedef typename E::storage_category storage_category; + typedef typename E::simd_category simd_category; // Construction and destruction BOOST_UBLAS_INLINE diff --git a/include/boost/numeric/ublas/vector_expression.hpp b/include/boost/numeric/ublas/vector_expression.hpp index d7e2e105..cdbdbf04 100644 --- a/include/boost/numeric/ublas/vector_expression.hpp +++ b/include/boost/numeric/ublas/vector_expression.hpp @@ -189,7 +189,6 @@ namespace boost { namespace numeric { namespace ublas { BOOST_UBLAS_USING vector_expression >::operator (); #endif typedef E expression_type; - typedef typename E::simd_category simd_category; typedef typename E::size_type size_type; typedef typename E::difference_type difference_type; typedef typename E::value_type value_type; @@ -198,7 +197,8 @@ namespace boost { namespace numeric { namespace ublas { typedef typename E::const_pointer const_pointer; typedef const_pointer pointer; typedef typename E::const_iterator const_iterator_type; - typedef unknown_storage_tag storage_category; + typedef typename E::storage_category storage_category; + typedef typename E::simd_category simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -295,7 +295,6 @@ namespace boost { namespace numeric { namespace ublas { BOOST_UBLAS_USING vector_expression >::operator (); #endif typedef E expression_type; - typedef typename E::simd_category simd_category; typedef typename E::size_type size_type; typedef typename E::difference_type difference_type; typedef typename E::value_type value_type; @@ -327,7 +326,8 @@ namespace boost { namespace numeric { namespace ublas { typename E::const_iterator, typename E::iterator>::type iterator_type; #endif - typedef unknown_storage_tag storage_category; + typedef typename E::storage_category storage_category; + typedef typename E::simd_category simd_category; // Construction and destruction BOOST_UBLAS_INLINE