Boost logo

Boost-Commit :

From: steven_at_[hidden]
Date: 2008-06-28 17:01:40


Author: steven_watanabe
Date: 2008-06-28 17:01:40 EDT (Sat, 28 Jun 2008)
New Revision: 46828
URL: http://svn.boost.org/trac/boost/changeset/46828

Log:
Attempt to solve pathscale failures
Text files modified:
   trunk/boost/units/base_dimension.hpp | 4 ++--
   trunk/boost/units/base_unit.hpp | 4 ++--
   trunk/boost/units/detail/one.hpp | 3 ++-
   trunk/boost/units/detail/prevent_redefinition.hpp | 4 ++--
   4 files changed, 8 insertions(+), 7 deletions(-)

Modified: trunk/boost/units/base_dimension.hpp
==============================================================================
--- trunk/boost/units/base_dimension.hpp (original)
+++ trunk/boost/units/base_dimension.hpp 2008-06-28 17:01:40 EDT (Sat, 28 Jun 2008)
@@ -77,13 +77,13 @@
         /// INTERNAL ONLY
         friend detail::yes
         boost_units_is_registered(const units::base_dimension_ordinal<N>&)
- { return(detail::yes()); }
+ { detail::yes result; return(result); }
         
         /// But make sure we can identify the current instantiation!
         /// INTERNAL ONLY
         friend detail::yes
         boost_units_is_registered(const units::base_dimension_pair<Derived, N>&)
- { return(detail::yes()); }
+ { detail::yes result; return(result); }
 };
 
 } // namespace units

Modified: trunk/boost/units/base_unit.hpp
==============================================================================
--- trunk/boost/units/base_unit.hpp (original)
+++ trunk/boost/units/base_unit.hpp 2008-06-28 17:01:40 EDT (Sat, 28 Jun 2008)
@@ -98,13 +98,13 @@
         /// INTERNAL ONLY
         friend detail::yes
         boost_units_unit_is_registered(const units::base_unit_ordinal<N>&)
- { return(detail::yes()); }
+ { detail::yes result; return(result); }
         
         /// But make sure we can identify the current instantiation!
         /// INTERNAL ONLY
         friend detail::yes
         boost_units_unit_is_registered(const units::base_unit_pair<Derived, N>&)
- { return(detail::yes()); }
+ { detail::yes result; return(result); }
 };
 
 } // namespace units

Modified: trunk/boost/units/detail/one.hpp
==============================================================================
--- trunk/boost/units/detail/one.hpp (original)
+++ trunk/boost/units/detail/one.hpp 2008-06-28 17:01:40 EDT (Sat, 28 Jun 2008)
@@ -86,7 +86,8 @@
 
 inline one operator/(const one&, const one&)
 {
- return(one());
+ one result;
+ return(result);
 }
 
 } // namespace units

Modified: trunk/boost/units/detail/prevent_redefinition.hpp
==============================================================================
--- trunk/boost/units/detail/prevent_redefinition.hpp (original)
+++ trunk/boost/units/detail/prevent_redefinition.hpp 2008-06-28 17:01:40 EDT (Sat, 28 Jun 2008)
@@ -39,13 +39,13 @@
 template<class T>
 detail::no
 boost_units_is_registered(const T&)
-{ return(detail::no()); }
+{ detail::no result; return(result); }
 
 /// INTERNAL ONLY
 template<class T>
 detail::no
 boost_units_unit_is_registered(const T&)
-{ return(detail::no()); }
+{ detail::no result; return(result); }
 
 } // namespace units
 


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