diff --git a/Jamfile b/Jamfile index 3ba95685..4d80859e 100644 --- a/Jamfile +++ b/Jamfile @@ -37,9 +37,9 @@ UBLAS_TESTSET ?= UBLAS_TESTSET_SPARSE ?= USE_DOUBLE USE_STD_COMPLEX -# USE_RANGE USE_SLICE Too complex for regression testing +# USE_RANGE USE_SLICE Too complex for regression testing USE_UNBOUNDED_ARRAY - USE_STD_MAP + USE_STD_MAP USE_SPARSE_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR USE_SPARSE_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX ; diff --git a/include/boost/numeric/ublas/config.hpp b/include/boost/numeric/ublas/config.hpp index 4a4a3c90..849f84b5 100644 --- a/include/boost/numeric/ublas/config.hpp +++ b/include/boost/numeric/ublas/config.hpp @@ -144,7 +144,7 @@ namespace boost { namespace numeric { namespace ublas { }}} namespace std { - // Needed for ICC on Itanium? + // Needed for ICC on Itanium? template inline void iter_swap (boost::numeric::ublas::indexed_iterator it1, diff --git a/include/boost/numeric/ublas/matrix_sparse.hpp b/include/boost/numeric/ublas/matrix_sparse.hpp index 6c08d403..24797f53 100644 --- a/include/boost/numeric/ublas/matrix_sparse.hpp +++ b/include/boost/numeric/ublas/matrix_sparse.hpp @@ -76,7 +76,7 @@ namespace boost { namespace numeric { namespace ublas { // Assignment BOOST_UBLAS_INLINE sparse_matrix_element &operator = (const sparse_matrix_element &p) { - // Overide the implict copy assignment + // Overide the implict copy assignment d_ = p.d_; dirty_ = true; return *this; @@ -117,7 +117,7 @@ namespace boost { namespace numeric { namespace ublas { return *this; } - // Comparison + // Comparison template BOOST_UBLAS_INLINE bool operator == (const D &d) const { diff --git a/include/boost/numeric/ublas/vector_sparse.hpp b/include/boost/numeric/ublas/vector_sparse.hpp index 5555b341..43dd48e3 100644 --- a/include/boost/numeric/ublas/vector_sparse.hpp +++ b/include/boost/numeric/ublas/vector_sparse.hpp @@ -75,7 +75,7 @@ namespace boost { namespace numeric { namespace ublas { // Assignment BOOST_UBLAS_INLINE sparse_vector_element &operator = (const sparse_vector_element &p) { - // Overide the implict copy assignment + // Overide the implict copy assignment d_ = p.d_; dirty_ = true; return *this; @@ -116,7 +116,7 @@ namespace boost { namespace numeric { namespace ublas { return *this; } - // Comparison + // Comparison template BOOST_UBLAS_INLINE bool operator == (const D &d) const { diff --git a/test1/test1.hpp b/test1/test1.hpp index badf582f..2749a748 100644 --- a/test1/test1.hpp +++ b/test1/test1.hpp @@ -41,12 +41,12 @@ void test_matrix (); // Disable some tests for truly broken compilers - // MSVC Version 6.0 & 7.0 have problems compiling with std::complex + // MSVC Version 6.0 & 7.0 have problems compiling with std::complex #if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) #undef USE_STD_COMPLEX #endif - // Intel for Windows fails to link when a std::complex is returned! + // Intel for Windows fails to link when a std::complex is returned! #if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL) #undef USE_STD_COMPLEX #endif diff --git a/test2/test2.hpp b/test2/test2.hpp index e809321f..2b057662 100644 --- a/test2/test2.hpp +++ b/test2/test2.hpp @@ -83,12 +83,12 @@ struct test_blas_3 { // Disable some tests for truly broken compilers - // MSVC Version 6.0 & 7.0 have problems compiling with std::complex + // MSVC Version 6.0 & 7.0 have problems compiling with std::complex #if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) #undef USE_STD_COMPLEX #endif - // Intel for Windows fails to link when a std::complex is returned! + // Intel for Windows fails to link when a std::complex is returned! #if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL) #undef USE_STD_COMPLEX #endif diff --git a/test3/test3.hpp b/test3/test3.hpp index d982510a..3b5b1046 100644 --- a/test3/test3.hpp +++ b/test3/test3.hpp @@ -40,12 +40,12 @@ void test_matrix_vector (); void test_matrix (); // Disable some tests for truly broken compilers - // MSVC Version 6.0 & 7.0 have problems compiling with std::complex + // MSVC Version 6.0 & 7.0 have problems compiling with std::complex #if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) #undef USE_STD_COMPLEX #endif - // Intel for Windows fails to link when a std::complex is returned! + // Intel for Windows fails to link when a std::complex is returned! #if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL) #undef USE_STD_COMPLEX #endif diff --git a/test4/test4.hpp b/test4/test4.hpp index 5c20a00d..4b9494fa 100644 --- a/test4/test4.hpp +++ b/test4/test4.hpp @@ -49,12 +49,12 @@ void test_matrix (); // Disable some tests for truly broken compilers - // MSVC Version 6.0 & 7.0 have problems compiling with std::complex + // MSVC Version 6.0 & 7.0 have problems compiling with std::complex #if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) #undef USE_STD_COMPLEX #endif - // Intel for Windows fails to link when a std::complex is returned! + // Intel for Windows fails to link when a std::complex is returned! #if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL) #undef USE_STD_COMPLEX #endif diff --git a/test5/test5.hpp b/test5/test5.hpp index ab633ceb..211be8b6 100644 --- a/test5/test5.hpp +++ b/test5/test5.hpp @@ -66,12 +66,12 @@ void test_matrix (); // Disable some tests for truly broken compilers - // MSVC Version 6.0 & 7.0 have problems compiling with std::complex + // MSVC Version 6.0 & 7.0 have problems compiling with std::complex #if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) #undef USE_STD_COMPLEX #endif - // Intel for Windows fails to link when a std::complex is returned! + // Intel for Windows fails to link when a std::complex is returned! #if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL) #undef USE_STD_COMPLEX #endif diff --git a/test6/test6.hpp b/test6/test6.hpp index 1df5aef5..e6bb5e88 100644 --- a/test6/test6.hpp +++ b/test6/test6.hpp @@ -66,12 +66,12 @@ void test_matrix (); // Disable some tests for truly broken compilers - // MSVC Version 6.0 & 7.0 have problems compiling with std::complex + // MSVC Version 6.0 & 7.0 have problems compiling with std::complex #if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) #undef USE_STD_COMPLEX #endif - // Intel for Windows fails to link when a std::complex is returned! + // Intel for Windows fails to link when a std::complex is returned! #if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL) #undef USE_STD_COMPLEX #endif