[Boost-commit] svn:boost r4415

From: steven_watanabe_at_[hidden]
Date: 2007-06-01 13:43:14

Author: steven_watanabe
Date: 2007-06-01 13:43:12 EDT (Fri, 01 Jun 2007)
New Revision: 4415
URL: http://svn.boost.org/trac/boost/changeset/4415

Log:
Allow multiple scales/fix >>

Text files modified: 
   sandbox/units/boost/units/scaled_base_unit.hpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: sandbox/units/boost/units/scaled_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/scaled_base_unit.hpp	(original)
+++ sandbox/units/boost/units/scaled_base_unit.hpp	2007-06-01 13:43:12 EDT (Fri, 01 Jun 2007)
@@ -55,7 +55,7 @@
 
 #define BOOST_UNITS_SCALE_SPECIALIZATION(base_,exponent_,val,name,symbol)   \
 template<>                                                                  \
-struct scale<base_, exponent_>                                              \
+struct scale<base_, exponent_ >                                             \
 {                                                                           \
     static const long base = base_;                                         \
     typedef exponent_ exponent;                                             \
@@ -155,7 +155,7 @@
 
 template<class S, class Scale>
 struct unscale<scaled_base_unit<S, Scale> > {
-    typedef S type;
+    typedef typename unscale<S>::type type;
 };
 
 template<class D, class S>
@@ -176,7 +176,7 @@
 
 template<class S, class Scale>
 struct get_scale_list<scaled_base_unit<S, Scale> > {
-    typedef dimension_list<scale_list_dim<Scale>, dimensionless_type> type;
+    typedef typename mpl::times<dimension_list<scale_list_dim<Scale>, dimensionless_type>, typename get_scale_list<S>::type>::type type;
 };
 
 template<class D, class S>