diff --git a/include/boost/numeric/ublas/matrix.hpp b/include/boost/numeric/ublas/matrix.hpp index 31e522eb..68c57e0d 100644 --- a/include/boost/numeric/ublas/matrix.hpp +++ b/include/boost/numeric/ublas/matrix.hpp @@ -2099,19 +2099,19 @@ namespace boost { namespace numeric { namespace ublas { // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return *this; } BOOST_UBLAS_INLINE const_iterator1 &operator -- () { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return *this; } // Dereference BOOST_UBLAS_INLINE const_reference operator * () const { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return zero_; // arbitary return value } @@ -2149,12 +2149,12 @@ namespace boost { namespace numeric { namespace ublas { // Indices BOOST_UBLAS_INLINE size_type index1 () const { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return 0; // arbitary return value } BOOST_UBLAS_INLINE size_type index2 () const { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return 0; // arbitary return value } @@ -2208,19 +2208,19 @@ namespace boost { namespace numeric { namespace ublas { // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return *this; } BOOST_UBLAS_INLINE const_iterator2 &operator -- () { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return *this; } // Dereference BOOST_UBLAS_INLINE const_reference operator * () const { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return zero_; // arbitary return value } @@ -2258,12 +2258,12 @@ namespace boost { namespace numeric { namespace ublas { // Indices BOOST_UBLAS_INLINE size_type index1 () const { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return 0; // arbitary return value } BOOST_UBLAS_INLINE size_type index2 () const { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return 0; // arbitary return value } diff --git a/include/boost/numeric/ublas/vector.hpp b/include/boost/numeric/ublas/vector.hpp index b6d900a1..4954212e 100644 --- a/include/boost/numeric/ublas/vector.hpp +++ b/include/boost/numeric/ublas/vector.hpp @@ -299,7 +299,7 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const self_type &v, const const_subiterator_type &it): container_const_reference (v), it_ (it) {} BOOST_UBLAS_INLINE - const_iterator (const iterator &it): + const_iterator (const typename vector::iterator &it): // ISSUE vector:: stops VC8 using std::iteraot here container_const_reference (it ()), it_ (it.it_) {} // Arithmetic @@ -686,26 +686,26 @@ namespace boost { namespace numeric { namespace ublas { // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return *this; } BOOST_UBLAS_INLINE const_iterator &operator -- () { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return *this; } // Dereference BOOST_UBLAS_INLINE const_reference operator * () const { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return zero_; // arbitary return value } // Index BOOST_UBLAS_INLINE size_type index () const { - BOOST_UBLAS_CHECK (false, bad_index ()); + BOOST_UBLAS_CHECK_FALSE (bad_index ()); return 0; // arbitary return value } @@ -1465,7 +1465,7 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const self_type &v, const const_subiterator_type &it): container_const_reference (v), it_ (it) {} BOOST_UBLAS_INLINE - const_iterator (const iterator &it): + const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iteraot here container_const_reference (it ()), it_ (it.it_) {} // Arithmetic