[Boost-commit] svn:boost r56605 - in branches/release: boost/numeric/ublas libs/numeric/ublas libs/numeric/ublas/test

Subject: [Boost-commit] svn:boost r56605 - in branches/release: boost/numeric/ublas libs/numeric/ublas libs/numeric/ublas/test
From: guwi17_at_[hidden]
Date: 2009-10-05 17:41:33

Author: guwi17
Date: 2009-10-05 17:41:32 EDT (Mon, 05 Oct 2009)
New Revision: 56605
URL: http://svn.boost.org/trac/boost/changeset/56605

Log:
fix #2195:
 * merged changes into release branch

Added:
   branches/release/libs/numeric/ublas/test/comp_mat_erase.cpp
      - copied unchanged from r54230, /trunk/libs/numeric/ublas/test/comp_mat_erase.cpp
Properties modified: 
   branches/release/boost/numeric/ublas/   (props changed)
   branches/release/libs/numeric/ublas/   (props changed)
Text files modified: 
   branches/release/boost/numeric/ublas/matrix_sparse.hpp  |     2 +-                                      
   branches/release/libs/numeric/ublas/test/CMakeLists.txt |     1 +                                       
   branches/release/libs/numeric/ublas/test/Jamfile.v2     |     2 ++                                      
   3 files changed, 4 insertions(+), 1 deletions(-)

Modified: branches/release/boost/numeric/ublas/matrix_sparse.hpp
==============================================================================
--- branches/release/boost/numeric/ublas/matrix_sparse.hpp	(original)
+++ branches/release/boost/numeric/ublas/matrix_sparse.hpp	2009-10-05 17:41:32 EDT (Mon, 05 Oct 2009)
@@ -2903,7 +2903,7 @@
         void erase_element (size_type i, size_type j) {
             size_type element1 = layout_type::index_M (i, j);
             size_type element2 = layout_type::index_m (i, j);
-            if (element1 + 1 > filled1_)
+            if (element1 + 1 >= filled1_)
                 return;
             vector_subiterator_type itv (index1_data_.begin () + element1);
             subiterator_type it_begin (index2_data_.begin () + zero_based (*itv));

Modified: branches/release/libs/numeric/ublas/test/CMakeLists.txt
==============================================================================
--- branches/release/libs/numeric/ublas/test/CMakeLists.txt	(original)
+++ branches/release/libs/numeric/ublas/test/CMakeLists.txt	2009-10-05 17:41:32 EDT (Mon, 05 Oct 2009)
@@ -72,6 +72,7 @@
 boost_test_run(triangular_layout 
   triangular_layout.cpp)
 
+boost_test_run(comp_mat_erase)
 
 SET(test_compile_flags "-DEXTERNAL")
 #-- Intel Compiler flags

Modified: branches/release/libs/numeric/ublas/test/Jamfile.v2
==============================================================================
--- branches/release/libs/numeric/ublas/test/Jamfile.v2	(original)
+++ branches/release/libs/numeric/ublas/test/Jamfile.v2	2009-10-05 17:41:32 EDT (Mon, 05 Oct 2009)
@@ -114,4 +114,6 @@
       ]
       [ run triangular_layout.cpp
       ]
+      [ run comp_mat_erase.cpp
+      ]
     ;