[Boost-commit] svn:boost r49970 - in trunk/boost/units: base_units/temperature detail

Subject: [Boost-commit] svn:boost r49970 - in trunk/boost/units: base_units/temperature detail
From: steven_at_[hidden]
Date: 2008-11-27 16:50:14

Author: steven_watanabe
Date: 2008-11-27 16:50:13 EST (Thu, 27 Nov 2008)
New Revision: 49970
URL: http://svn.boost.org/trac/boost/changeset/49970

Log:
Remove the last instance of one() to make pathscale happy
Text files modified: 
   trunk/boost/units/base_units/temperature/conversions.hpp |     2 +-                                      
   trunk/boost/units/detail/one.hpp                         |     6 ++++++                                  
   2 files changed, 7 insertions(+), 1 deletions(-)

Modified: trunk/boost/units/base_units/temperature/conversions.hpp
==============================================================================
--- trunk/boost/units/base_units/temperature/conversions.hpp	(original)
+++ trunk/boost/units/base_units/temperature/conversions.hpp	2008-11-27 16:50:13 EST (Thu, 27 Nov 2008)
@@ -18,7 +18,7 @@
     #define BOOST_UNITS_SYSTEMS_KELVIN_TO_CELSIUS_CONVERSION_DEFINED
     #include <boost/units/conversion.hpp>
     #include <boost/units/absolute.hpp>
-    BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::si::kelvin_base_unit, boost::units::temperature::celsius_base_unit, one, one());
+    BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::si::kelvin_base_unit, boost::units::temperature::celsius_base_unit, one, make_one());
     BOOST_UNITS_DEFINE_CONVERSION_OFFSET(boost::units::si::kelvin_base_unit, boost::units::temperature::celsius_base_unit, double, -273.15);
 #endif
 

Modified: trunk/boost/units/detail/one.hpp
==============================================================================
--- trunk/boost/units/detail/one.hpp	(original)
+++ trunk/boost/units/detail/one.hpp	2008-11-27 16:50:13 EST (Thu, 27 Nov 2008)
@@ -19,6 +19,12 @@
 
 struct one { one() {} };
 
+// workaround for pathscale.
+one make_one() {
+    one result;
+    return(result);
+}
+
 template<class T>
 struct multiply_typeof_helper<one, T>
 {