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

Subject: [Boost-commit] svn:boost r61115 - in branches/release: boost/numeric/ublas boost/numeric/ublas/detail libs/numeric/ublas libs/numeric/ublas/doc
From: guwi17_at_[hidden]
Date: 2010-04-06 16:18:14

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

Log:
fix #3501: merge changes 57202,57208,61114 into release

boost/numeric/ublas/detail/concepts.hpp
libs/numeric/ublas/doc/release_notes.htm

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/detail/concepts.hpp  |    28 +++++++---------------------            
   branches/release/libs/numeric/ublas/doc/release_notes.htm |     8 ++++----                                
   2 files changed, 11 insertions(+), 25 deletions(-)

Modified: branches/release/boost/numeric/ublas/detail/concepts.hpp
==============================================================================
--- branches/release/boost/numeric/ublas/detail/concepts.hpp	(original)
+++ branches/release/boost/numeric/ublas/detail/concepts.hpp	2010-04-06 16:18:13 EDT (Tue, 06 Apr 2010)
@@ -634,77 +634,70 @@
         }
     };
 
+    /** introduce anonymous namespace to make following functions
+     * local to the current compilation unit.
+     */
+    namespace {
+
     template<class T>
     T
     ZeroElement (T);
     template<>
-    BOOST_UBLAS_INLINE
     float
     ZeroElement (float) {
         return 0.f;
     }
     template<>
-    BOOST_UBLAS_INLINE
     double
     ZeroElement (double) {
         return 0.;
     }
     template<>
-    BOOST_UBLAS_INLINE
     vector<float>
     ZeroElement (vector<float>) {
         return zero_vector<float> ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     vector<double>
     ZeroElement (vector<double>) {
         return zero_vector<double> ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     matrix<float>
     ZeroElement (matrix<float>) {
         return zero_matrix<float> ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     matrix<double>
     ZeroElement (matrix<double>) {
         return zero_matrix<double> ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     std::complex<float>
     ZeroElement (std::complex<float>) {
         return std::complex<float> (0.f);
     }
     template<>
-    BOOST_UBLAS_INLINE
     std::complex<double>
     ZeroElement (std::complex<double>) {
         return std::complex<double> (0.);
     }
     template<>
-    BOOST_UBLAS_INLINE
     vector<std::complex<float> >
     ZeroElement (vector<std::complex<float> >) {
         return zero_vector<std::complex<float> > ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     vector<std::complex<double> >
     ZeroElement (vector<std::complex<double> >) {
         return zero_vector<std::complex<double> > ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     matrix<std::complex<float> >
     ZeroElement (matrix<std::complex<float> >) {
         return zero_matrix<std::complex<float> > ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     matrix<std::complex<double> >
     ZeroElement (matrix<std::complex<double> >) {
         return zero_matrix<std::complex<double> > ();
@@ -714,49 +707,41 @@
     T
     OneElement (T);
     template<>
-    BOOST_UBLAS_INLINE
     float
     OneElement (float) {
         return 1.f;
     }
     template<>
-    BOOST_UBLAS_INLINE
     double
     OneElement (double) {
         return 1.;
     }
     template<>
-    BOOST_UBLAS_INLINE
     matrix<float>
     OneElement (matrix<float>) {
         return identity_matrix<float> ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     matrix<double>
     OneElement (matrix<double>) {
         return identity_matrix<double> ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     std::complex<float>
     OneElement (std::complex<float>) {
         return std::complex<float> (1.f);
     }
     template<>
-    BOOST_UBLAS_INLINE
     std::complex<double>
     OneElement (std::complex<double>) {
         return std::complex<double> (1.);
     }
     template<>
-    BOOST_UBLAS_INLINE
     matrix<std::complex<float> >
     OneElement (matrix<std::complex<float> >) {
         return identity_matrix<std::complex<float> > ();
     }
     template<>
-    BOOST_UBLAS_INLINE
     matrix<std::complex<double> >
     OneElement (matrix<std::complex<double> >) {
         return identity_matrix<std::complex<double> > ();
@@ -908,7 +893,6 @@
         }
     };
 
-    BOOST_UBLAS_INLINE
     void concept_checks () {
 
         // Allow tests to be group to keep down compiler storage requirement
@@ -1549,6 +1533,8 @@
 #endif
     }
 
+    } // end of anonymous namespace
+
 }}}
 
 #endif

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:18:13 EDT (Tue, 06 Apr 2010)
@@ -25,6 +25,8 @@
 <ul>
 <li>[3968] fixed coordinate_matrix sort problem on MSVC10
 </li>
+<li>[3501] Moved free functions in <code>concepts.hpp</code> into anonymous namespace.
+</li>
 </ul>
 
 <h2>Release 1.41.1</h2>
@@ -45,11 +47,9 @@
 <h3>bug fixes</h3>
 
 <ul>
-<li>[3293]Fix resizing problem in <code>identity_matrix</code>
-</li>
-<li>[3499]Add DefaultConstructible to concept checks
+<li>[3293] Fix resizing problem in <code>identity_matrix</code>
 </li>
-<li>[3501]Add <i>inline</i> to free functions in <code>concepts.hpp</code>
+<li>[3499] Add DefaultConstructible to concept checks
 </li>
 </ul>