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

Subject: [Boost-commit] svn:boost r61112 - in branches/release: boost/numeric/ublas libs/numeric/ublas libs/numeric/ublas/doc libs/numeric/ublas/test
From: guwi17_at_[hidden]
Date: 2010-04-06 16:09:05

Author: guwi17
Date: 2010-04-06 16:09:04 EDT (Tue, 06 Apr 2010)
New Revision: 61112
URL: http://svn.boost.org/trac/boost/changeset/61112

Log:
close #3968: merge 60156,60215,60623,60780,61111 into release

boost/numeric/ublas/storage.hpp
libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp
libs/numeric/ublas/test/utils.hpp
libs/numeric/ublas/test/Jamfile.v2
libs/numeric/ublas/doc/release_notes.htm

Added:
   branches/release/libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp
      - copied, changed from r60215, /trunk/libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp
Properties modified: 
   branches/release/boost/numeric/ublas/   (props changed)
   branches/release/libs/numeric/ublas/   (props changed)
   branches/release/libs/numeric/ublas/doc/   (props changed)
Text files modified: 
   branches/release/boost/numeric/ublas/storage.hpp                         |     8 ++++----                                
   branches/release/libs/numeric/ublas/doc/release_notes.htm                |     9 +++++++++                               
   branches/release/libs/numeric/ublas/test/Jamfile.v2                      |     2 ++                                      
   branches/release/libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp |     6 ++++--                                  
   branches/release/libs/numeric/ublas/test/utils.hpp                       |     3 ++-                                     
   5 files changed, 21 insertions(+), 7 deletions(-)

Modified: branches/release/boost/numeric/ublas/storage.hpp
==============================================================================
--- branches/release/boost/numeric/ublas/storage.hpp	(original)
+++ branches/release/boost/numeric/ublas/storage.hpp	2010-04-06 16:09:04 EDT (Tue, 06 Apr 2010)
@@ -1598,13 +1598,13 @@
         }
 
         BOOST_UBLAS_INLINE
-        void swap(self_type rhs) {
+        void swap(self_type& rhs) {
             self_type tmp(rhs);
             rhs = *this;
             *this = tmp;
         }
         BOOST_UBLAS_INLINE
-        friend void swap(self_type lhs, self_type rhs) {
+        friend void swap(self_type& lhs, self_type& rhs) {
             lhs.swap(rhs);
         }
 
@@ -1770,13 +1770,13 @@
         }
 
         BOOST_UBLAS_INLINE
-        void swap(self_type rhs) {
+        void swap(self_type& rhs) {
             self_type tmp(rhs);
             rhs = *this;
             *this = tmp;
         }
         BOOST_UBLAS_INLINE
-        friend void swap(self_type lhs, self_type rhs) {
+        friend void swap(self_type& lhs, self_type& rhs) {
             lhs.swap(rhs);
         }
 

Modified: branches/release/libs/numeric/ublas/doc/release_notes.htm
==============================================================================
--- branches/release/libs/numeric/ublas/doc/release_notes.htm	(original)
+++ branches/release/libs/numeric/ublas/doc/release_notes.htm	2010-04-06 16:09:04 EDT (Tue, 06 Apr 2010)
@@ -18,6 +18,15 @@
 </div>
 <div class="toc" id="toc"></div>
 
+<h2>Release 1.43.0</h2>
+
+<h3>bug fixes</h3>
+
+<ul>
+<li>[3968] fixed coordinate_matrix sort problem on MSVC10
+</li>
+</ul>
+
 <h2>Release 1.41.1</h2>
 
 <h3>new features</h3>

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	2010-04-06 16:09:04 EDT (Tue, 06 Apr 2010)
@@ -126,4 +126,6 @@
       ]
       [ run size.cpp
       ]
+      [ run test_coordinate_matrix_sort.cpp
+      ]
     ;

Copied: branches/release/libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp (from r60215, /trunk/libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp)
==============================================================================
--- /trunk/libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp	(original)
+++ branches/release/libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp	2010-04-06 16:09:04 EDT (Tue, 06 Apr 2010)
@@ -1,4 +1,6 @@
-#define BOOST_UBLAS_NO_ELEMENT_PROXIES
+#ifndef BOOST_UBLAS_NO_ELEMENT_PROXIES
+# define BOOST_UBLAS_NO_ELEMENT_PROXIES
+#endif
 
 #include<boost/numeric/ublas/matrix_sparse.hpp>
 #include<boost/numeric/ublas/io.hpp>
@@ -51,7 +53,7 @@
     BOOST_UBLAS_TEST_CHECK( matrix_mask(1,1) == 2.1 );
 
     BOOST_UBLAS_DEBUG_TRACE( "Displaying matrix(0,1)" << matrix_mask(0,1) );
-    BOOST_UBLAS_TEST_CHECK( matrix_mask(1,1) == 1.1 );
+    BOOST_UBLAS_TEST_CHECK( matrix_mask(0,1) == 1.1 );
 
 }
 

Modified: branches/release/libs/numeric/ublas/test/utils.hpp
==============================================================================
--- branches/release/libs/numeric/ublas/test/utils.hpp	(original)
+++ branches/release/libs/numeric/ublas/test/utils.hpp	2010-04-06 16:09:04 EDT (Tue, 06 Apr 2010)
@@ -25,7 +25,8 @@
 
 #define BOOST_UBLAS_TEST_DO(x) EXPAND_(x)(test_fails_)
 
-#define BOOST_UBLAS_TEST_END() if (test_fails_ > 0) { std::cerr << "Number of failed tests: " << test_fails_ << std::endl; } else { std::cerr << "No failed test" << std::endl; }
+#define BOOST_UBLAS_TEST_END() if (test_fails_ > 0) { std::cerr << "Number of failed tests: " << test_fails_ << std::endl; return -1; \
+} else { std::cerr << "No failed test" << std::endl; return 0; }
 
 #define BOOST_UBLAS_TEST_CHECK(x) if (!(x)) { std::cerr << "Failed assertion: " << STRINGIFY_(x) << std::endl; ++test_fails_; }