diff --git a/blaze/math/dense/DynamicMatrix.h b/blaze/math/dense/DynamicMatrix.h index e0d08809..3e55a209 100644 --- a/blaze/math/dense/DynamicMatrix.h +++ b/blaze/math/dense/DynamicMatrix.h @@ -1587,7 +1587,7 @@ inline typename DynamicMatrix::IntrinsicType BLAZE_INTERNAL_ASSERT( j + IT::size <= nn_, "Invalid column access index" ); BLAZE_INTERNAL_ASSERT( j % IT::size == 0UL, "Invalid column access index" ); - return load( &v_[i*nn_+j] ); + return load( v_+i*nn_+j ); } //************************************************************************************************* @@ -1620,7 +1620,7 @@ inline typename DynamicMatrix::IntrinsicType BLAZE_INTERNAL_ASSERT( j < n_ , "Invalid column access index" ); BLAZE_INTERNAL_ASSERT( j + IT::size <= nn_, "Invalid column access index" ); - return loadu( &v_[i*nn_+j] ); + return loadu( v_+i*nn_+j ); } //************************************************************************************************* @@ -1654,7 +1654,7 @@ inline void DynamicMatrix::store( size_t i, size_t j, const IntrinsicTy BLAZE_INTERNAL_ASSERT( j + IT::size <= nn_, "Invalid column access index" ); BLAZE_INTERNAL_ASSERT( j % IT::size == 0UL, "Invalid column access index" ); - store( &v_[i*nn_+j], value ); + store( v_+i*nn_+j, value ); } //************************************************************************************************* @@ -1687,7 +1687,7 @@ inline void DynamicMatrix::storeu( size_t i, size_t j, const IntrinsicT BLAZE_INTERNAL_ASSERT( j < n_ , "Invalid column access index" ); BLAZE_INTERNAL_ASSERT( j + IT::size <= nn_, "Invalid column access index" ); - storeu( &v_[i*nn_+j], value ); + storeu( v_+i*nn_+j, value ); } //************************************************************************************************* @@ -1721,7 +1721,7 @@ inline void DynamicMatrix::stream( size_t i, size_t j, const IntrinsicT BLAZE_INTERNAL_ASSERT( j + IT::size <= nn_, "Invalid column access index" ); BLAZE_INTERNAL_ASSERT( j % IT::size == 0UL, "Invalid column access index" ); - stream( &v_[i*nn_+j], value ); + stream( v_+i*nn_+j, value ); } //************************************************************************************************* @@ -1791,7 +1791,7 @@ inline typename EnableIf< typename DynamicMatrix::BLAZE_TEMPLATE Vector { for( size_t i=0UL; i::BLAZE_TEMPLATE Vector for( size_t i=0UL; i::BLAZE_TEMPLATE Vector for( size_t i=0UL; i::BLAZE_TEMPLATE Vector for( size_t i=0UL; i::IntrinsicType BLAZE_INTERNAL_ASSERT( i % IT::size == 0UL, "Invalid row access index" ); BLAZE_INTERNAL_ASSERT( j < n_ , "Invalid column access index" ); - return load( &v_[i+j*mm_] ); + return load( v_+i+j*mm_ ); } /*! \endcond */ //************************************************************************************************* @@ -3720,7 +3720,7 @@ inline typename DynamicMatrix::IntrinsicType BLAZE_INTERNAL_ASSERT( i + IT::size <= mm_, "Invalid row access index" ); BLAZE_INTERNAL_ASSERT( j < n_ , "Invalid column access index" ); - return loadu( &v_[i+j*mm_] ); + return loadu( v_+i+j*mm_ ); } /*! \endcond */ //************************************************************************************************* @@ -3754,7 +3754,7 @@ inline void DynamicMatrix::store( size_t i, size_t j, const Intrinsic BLAZE_INTERNAL_ASSERT( i % IT::size == 0UL, "Invalid row access index" ); BLAZE_INTERNAL_ASSERT( j < n_ , "Invalid column access index" ); - store( &v_[i+j*mm_], value ); + store( v_+i+j*mm_, value ); } /*! \endcond */ //************************************************************************************************* @@ -3787,7 +3787,7 @@ inline void DynamicMatrix::storeu( size_t i, size_t j, const Intrinsi BLAZE_INTERNAL_ASSERT( i + IT::size <= mm_, "Invalid row access index" ); BLAZE_INTERNAL_ASSERT( j < n_ , "Invalid column access index" ); - storeu( &v_[i+j*mm_], value ); + storeu( v_+i+j*mm_, value ); } /*! \endcond */ //************************************************************************************************* @@ -3822,7 +3822,7 @@ inline void DynamicMatrix::stream( size_t i, size_t j, const Intrinsi BLAZE_INTERNAL_ASSERT( i % IT::size == 0UL, "Invalid row access index" ); BLAZE_INTERNAL_ASSERT( j < n_ , "Invalid column access index" ); - stream( &v_[i+j*mm_], value ); + stream( v_+i+j*mm_, value ); } /*! \endcond */ //************************************************************************************************* @@ -3894,7 +3894,7 @@ inline typename EnableIf< typename DynamicMatrix::BLAZE_TEMPLATE Vect { for( size_t j=0UL; j::BLAZE_TEMPLATE Vect for( size_t j=0UL; j::BLAZE_TEMPLATE Vect for( size_t j=0UL; j::BLAZE_TEMPLATE Vect for( size_t j=0UL; j::IntrinsicType BLAZE_INTERNAL_ASSERT( index + IT::size <= capacity_, "Invalid vector access index" ); BLAZE_INTERNAL_ASSERT( index % IT::size == 0UL , "Invalid vector access index" ); - return load( &v_[index] ); + return load( v_+index ); } //************************************************************************************************* @@ -1342,7 +1342,7 @@ inline typename DynamicVector::IntrinsicType BLAZE_INTERNAL_ASSERT( index < size_ , "Invalid vector access index" ); BLAZE_INTERNAL_ASSERT( index + IT::size <= capacity_, "Invalid vector access index" ); - return loadu( &v_[index] ); + return loadu( v_+index ); } //************************************************************************************************* @@ -1373,7 +1373,7 @@ inline void DynamicVector::store( size_t index, const IntrinsicType& va BLAZE_INTERNAL_ASSERT( index + IT::size <= capacity_, "Invalid vector access index" ); BLAZE_INTERNAL_ASSERT( index % IT::size == 0UL , "Invalid vector access index" ); - store( &v_[index], value ); + store( v_+index, value ); } //************************************************************************************************* @@ -1403,7 +1403,7 @@ inline void DynamicVector::storeu( size_t index, const IntrinsicType& v BLAZE_INTERNAL_ASSERT( index < size_ , "Invalid vector access index" ); BLAZE_INTERNAL_ASSERT( index + IT::size <= capacity_, "Invalid vector access index" ); - storeu( &v_[index], value ); + storeu( v_+index, value ); } //************************************************************************************************* @@ -1434,7 +1434,7 @@ inline void DynamicVector::stream( size_t index, const IntrinsicType& v BLAZE_INTERNAL_ASSERT( index + IT::size <= capacity_, "Invalid vector access index" ); BLAZE_INTERNAL_ASSERT( index % IT::size == 0UL , "Invalid vector access index" ); - stream( &v_[index], value ); + stream( v_+index, value ); } //*************************************************************************************************