[Boost-commit] svn:boost r45635 - in sandbox/units/libs/units: example test_headers

From: steven_at_[hidden]
Date: 2008-05-21 23:45:35

Author: steven_watanabe
Date: 2008-05-21 23:45:34 EDT (Wed, 21 May 2008)
New Revision: 45635
URL: http://svn.boost.org/trac/boost/changeset/45635

Log:
Grrr... msvc 9.0 finds boost::math::pow by ADL
Text files modified: 
   sandbox/units/libs/units/example/quaternion.cpp  |     8 ++++----                                
   sandbox/units/libs/units/test_headers/Jamfile.v2 |     6 ++++--                                  
   2 files changed, 8 insertions(+), 6 deletions(-)

Modified: sandbox/units/libs/units/example/quaternion.cpp
==============================================================================
--- sandbox/units/libs/units/example/quaternion.cpp	(original)
+++ sandbox/units/libs/units/example/quaternion.cpp	2008-05-21 23:45:34 EDT (Wed, 21 May 2008)
@@ -2,7 +2,7 @@
 // unit/quantity manipulation and conversion
 //
 // Copyright (C) 2003-2008 Matthias Christian Schabel
-// Copyright (C) 2008 Steven Watanabe
+// Copyright (C) 2007-2008 Steven Watanabe
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -180,7 +180,7 @@
 
 int main(void)
 {
-	using boost::math::quaternion;
+    using boost::math::quaternion;
     using namespace boost::units;
     using namespace boost::units::test;
     using boost::units::pow;
@@ -200,7 +200,7 @@
               << "L-L     = " << L-L << std::endl
               << "L*L     = " << L*L << std::endl
               << "L/L     = " << L/L << std::endl
-              << "L^3     = " << pow<3>(L) << std::endl
+              << "L^3     = " << boost::units::pow<3>(L) << std::endl
 //              << "L^(3/2) = " << pow< static_rational<3,2> >(L) << std::endl
 //              << "3vL     = " << root<3>(L) << std::endl
 //              << "(3/2)vL = " << root< static_rational<3,2> >(L) << std::endl
@@ -220,7 +220,7 @@
               << "L-L     = " << L-L << std::endl
 //              << "L*L     = " << L*L << std::endl
 //              << "L/L     = " << L/L << std::endl
-              << "L^3     = " << pow<3>(L) << std::endl
+              << "L^3     = " << boost::units::pow<3>(L) << std::endl
 //              << "L^(3/2) = " << pow< static_rational<3,2> >(L) << std::endl
 //              << "3vL     = " << root<3>(L) << std::endl
 //              << "(3/2)vL = " << root< static_rational<3,2> >(L) << std::endl

Modified: sandbox/units/libs/units/test_headers/Jamfile.v2
==============================================================================
--- sandbox/units/libs/units/test_headers/Jamfile.v2	(original)
+++ sandbox/units/libs/units/test_headers/Jamfile.v2	2008-05-21 23:45:34 EDT (Wed, 21 May 2008)
@@ -31,11 +31,13 @@
 
 tests = [ setup ] ;
 
-generate-include-all-cpp include_all : $(headers) ;
+generate-include-all-cpp include_all1 : $(headers) ;
+generate-include-all-cpp include_all2 : $(headers) ;
 
 import testing ;
 
 test-suite units_headers :
   $(tests)
-  [ compile include_all : <include>. : include_all_headers ]
+# this ought to catch non-inlined functions and other duplicate definitions
+  [ link include_all1 include_all2 : <include>. : include_all_headers ]
   ;