From df6dfbb230550a4a76f206e756f5c0a1cbee1a42 Mon Sep 17 00:00:00 2001 From: Michael Stevens Date: Thu, 26 Aug 2004 16:28:10 +0000 Subject: [PATCH] code layout svn path=/trunk/boost/boost/numeric/ublas/; revision=24768 --- include/boost/numeric/ublas/matrix.hpp | 6 +++--- include/boost/numeric/ublas/matrix_proxy.hpp | 12 ++++++------ include/boost/numeric/ublas/vector.hpp | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/boost/numeric/ublas/matrix.hpp b/include/boost/numeric/ublas/matrix.hpp index 0ddcd4cc..b4a0b95c 100644 --- a/include/boost/numeric/ublas/matrix.hpp +++ b/include/boost/numeric/ublas/matrix.hpp @@ -36,7 +36,6 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - typedef concrete_tag simd_category; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; typedef T value_type; @@ -62,6 +61,7 @@ namespace boost { namespace numeric { namespace ublas { // typedef typename unknown_orientation_tag orientation_category; // but others depend on the orientation information... typedef typename functor_type::orientation_category orientation_category; + typedef concrete_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -979,7 +979,6 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - typedef concrete_tag simd_category; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; typedef T value_type; @@ -1007,6 +1006,7 @@ namespace boost { namespace numeric { namespace ublas { // typedef typename unknown_orientation_tag orientation_category; // but others depend on the orientation information... typedef typename functor_type::orientation_category orientation_category; + typedef concrete_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -3288,7 +3288,6 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING matrix_expression >::operator (); #endif - typedef concrete_tag simd_category; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; typedef T value_type; @@ -3311,6 +3310,7 @@ namespace boost { namespace numeric { namespace ublas { // typedef typename unknown_orientation_tag orientation_category; // but others depend on the orientation information... typedef row_major_tag orientation_category; + typedef concrete_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE diff --git a/include/boost/numeric/ublas/matrix_proxy.hpp b/include/boost/numeric/ublas/matrix_proxy.hpp index bfd11ea4..2a029009 100644 --- a/include/boost/numeric/ublas/matrix_proxy.hpp +++ b/include/boost/numeric/ublas/matrix_proxy.hpp @@ -35,7 +35,6 @@ namespace boost { namespace numeric { namespace ublas { #endif typedef const M const_matrix_type; typedef M matrix_type; - typedef abstract_tag simd_category; typedef typename M::size_type size_type; typedef typename M::difference_type difference_type; typedef typename M::value_type value_type; @@ -67,6 +66,7 @@ namespace boost { namespace numeric { namespace ublas { typedef self_type closure_type; typedef typename storage_restrict_traits::storage_category storage_category; + typedef abstract_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -544,7 +544,6 @@ namespace boost { namespace numeric { namespace ublas { #endif typedef const M const_matrix_type; typedef M matrix_type; - typedef abstract_tag simd_category; typedef typename M::size_type size_type; typedef typename M::difference_type difference_type; typedef typename M::value_type value_type; @@ -576,6 +575,7 @@ namespace boost { namespace numeric { namespace ublas { typedef self_type closure_type; typedef typename storage_restrict_traits::storage_category storage_category; + typedef abstract_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -1055,7 +1055,6 @@ namespace boost { namespace numeric { namespace ublas { #endif typedef const M const_matrix_type; typedef M matrix_type; - typedef abstract_tag simd_category; typedef typename M::size_type size_type; typedef typename M::difference_type difference_type; typedef typename M::value_type value_type; @@ -1087,6 +1086,7 @@ namespace boost { namespace numeric { namespace ublas { typedef self_type closure_type; typedef typename storage_restrict_traits::storage_category storage_category; + typedef abstract_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -1552,7 +1552,6 @@ namespace boost { namespace numeric { namespace ublas { #endif typedef const M const_matrix_type; typedef M matrix_type; - typedef abstract_tag simd_category; typedef typename M::size_type size_type; typedef typename M::difference_type difference_type; typedef typename M::value_type value_type; @@ -1584,6 +1583,7 @@ namespace boost { namespace numeric { namespace ublas { typedef self_type closure_type; typedef typename storage_restrict_traits::storage_category storage_category; + typedef abstract_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -2565,7 +2565,6 @@ namespace boost { namespace numeric { namespace ublas { #endif typedef const M const_matrix_type; typedef M matrix_type; - typedef typename M::simd_category simd_category; typedef typename M::size_type size_type; typedef typename M::difference_type difference_type; typedef typename M::value_type value_type; @@ -2598,6 +2597,7 @@ namespace boost { namespace numeric { namespace ublas { typedef typename storage_restrict_traits::storage_category storage_category; typedef typename M::orientation_category orientation_category; + typedef typename M::simd_category simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -3489,7 +3489,6 @@ namespace boost { namespace numeric { namespace ublas { #endif typedef const M const_matrix_type; typedef M matrix_type; - typedef typename M::simd_category simd_category; typedef typename M::size_type size_type; typedef typename M::difference_type difference_type; typedef typename M::value_type value_type; @@ -3522,6 +3521,7 @@ namespace boost { namespace numeric { namespace ublas { typedef typename storage_restrict_traits::storage_category storage_category; typedef typename M::orientation_category orientation_category; + typedef typename M::simd_category simd_category; // Construction and destruction BOOST_UBLAS_INLINE diff --git a/include/boost/numeric/ublas/vector.hpp b/include/boost/numeric/ublas/vector.hpp index 3ec029eb..e379a177 100644 --- a/include/boost/numeric/ublas/vector.hpp +++ b/include/boost/numeric/ublas/vector.hpp @@ -81,7 +81,6 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING vector_expression >::operator (); #endif - typedef concrete_tag simd_category; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; typedef T value_type; @@ -102,6 +101,7 @@ namespace boost { namespace numeric { namespace ublas { typedef typename A::const_iterator const_iterator_type; typedef typename A::iterator iterator_type; typedef dense_tag storage_category; + typedef concrete_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE @@ -1279,7 +1279,6 @@ namespace boost { namespace numeric { namespace ublas { #ifndef BOOST_UBLAS_NO_PROXY_SHORTCUTS BOOST_UBLAS_USING vector_expression >::operator (); #endif - typedef concrete_tag simd_category; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; typedef T value_type; @@ -1298,6 +1297,7 @@ namespace boost { namespace numeric { namespace ublas { typedef const T *const_iterator_type; typedef T *iterator_type; typedef dense_tag storage_category; + typedef concrete_tag simd_category; // Construction and destruction BOOST_UBLAS_INLINE