diff --git a/include/boost/numeric/ublas/matrix_expression.hpp b/include/boost/numeric/ublas/matrix_expression.hpp index c5f6e3c4..fb038574 100644 --- a/include/boost/numeric/ublas/matrix_expression.hpp +++ b/include/boost/numeric/ublas/matrix_expression.hpp @@ -40,7 +40,6 @@ namespace boost { namespace numeric { namespace ublas { // FIXME Template instantiation order problem // typedef typename E::size_type size_type; typedef std::size_t size_type; - typedef noalias_proxy noalias_proxy_type; typedef const matrix_row const_matrix_row_type; typedef matrix_row matrix_row_type; typedef const matrix_column const_matrix_column_type; @@ -61,10 +60,6 @@ namespace boost { namespace numeric { namespace ublas { return *static_cast (this); } - BOOST_UBLAS_INLINE - noalias_proxy_type noalias () { - return noalias_proxy_type (operator () ()); - } BOOST_UBLAS_INLINE const_matrix_row_type operator [] (size_type i) const { return const_matrix_row_type (operator () (), i); diff --git a/include/boost/numeric/ublas/vector_expression.hpp b/include/boost/numeric/ublas/vector_expression.hpp index b05c24c8..1d6d1aae 100644 --- a/include/boost/numeric/ublas/vector_expression.hpp +++ b/include/boost/numeric/ublas/vector_expression.hpp @@ -190,7 +190,6 @@ namespace boost { namespace numeric { namespace ublas { // FIXME Template instantiation order problem // typedef typename E::size_type size_type; - typedef noalias_proxy noalias_proxy_type; typedef const vector_range const_vector_range_type; typedef vector_range vector_range_type; typedef const vector_slice const_vector_slice_type; @@ -207,10 +206,6 @@ namespace boost { namespace numeric { namespace ublas { return *static_cast (this); } - BOOST_UBLAS_INLINE - noalias_proxy_type noalias () { - return noalias_proxy_type (operator () ()); - } #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS BOOST_UBLAS_INLINE const_vector_range_type operator () (const range &r) const { @@ -238,7 +233,7 @@ namespace boost { namespace numeric { namespace ublas { vector_indirect_type operator () (const indirect_array &ia) { return vector_indirect_type (operator () (), ia); } -#else +#endif BOOST_UBLAS_INLINE const_vector_range_type project (const range &r) const { return const_vector_range_type (operator () (), r); @@ -265,7 +260,6 @@ namespace boost { namespace numeric { namespace ublas { vector_indirect_type project (const indirect_array &ia) { return vector_indirect_type (operator () (), ia); } -#endif }; template