Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r56578 - trunk/boost/numeric/ublas/detail
From: guwi17_at_[hidden]
Date: 2009-10-04 15:27:35


Author: guwi17
Date: 2009-10-04 15:27:34 EDT (Sun, 04 Oct 2009)
New Revision: 56578
URL: http://svn.boost.org/trac/boost/changeset/56578

Log:
see #3501: Reusing concepts from different compile units yields multiple defined symbols
 * added BOOST_UBLAS_INLINE macros to requested locations
Text files modified:
   trunk/boost/numeric/ublas/detail/concepts.hpp | 21 +++++++++++++++++++++
   1 files changed, 21 insertions(+), 0 deletions(-)

Modified: trunk/boost/numeric/ublas/detail/concepts.hpp
==============================================================================
--- trunk/boost/numeric/ublas/detail/concepts.hpp (original)
+++ trunk/boost/numeric/ublas/detail/concepts.hpp 2009-10-04 15:27:34 EDT (Sun, 04 Oct 2009)
@@ -638,61 +638,73 @@
     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> > ();
@@ -702,41 +714,49 @@
     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> > ();
@@ -888,6 +908,7 @@
         }
     };
 
+ BOOST_UBLAS_INLINE
     void concept_checks () {
 
         // Allow tests to be group to keep down compiler storage requirement


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk