[Boost-commit] svn:boost r4515

From: steven_watanabe_at_[hidden]
Date: 2007-06-09 16:58:24

Author: steven_watanabe
Date: 2007-06-09 16:58:24 EDT (Sat, 09 Jun 2007)
New Revision: 4515
URL: http://svn.boost.org/trac/boost/changeset/4515

Log:
Minor fixes

Text files modified: 
   sandbox/units/boost/units/conversion.hpp |    18 +++++++-----------                      
   1 files changed, 7 insertions(+), 11 deletions(-)

Modified: sandbox/units/boost/units/conversion.hpp
==============================================================================
--- sandbox/units/boost/units/conversion.hpp	(original)
+++ sandbox/units/boost/units/conversion.hpp	2007-06-09 16:58:24 EDT (Sat, 09 Jun 2007)
@@ -177,9 +177,7 @@
 
 /// Defines the conversion factor from a base unit to any other base
 /// unit with the same dimensions.  Must appear at global scope.
-/// If the destination unit is a unit that contains only one
-/// base unit which is raised to the first power (e.g. feet->meters)
-/// the reverse need not be defined.
+/// The reverse need not be defined.
 #define BOOST_UNITS_DEFINE_BASE_CONVERSION(Source, Destination, type_, value_)   \
 namespace boost {                                                           \
 namespace units {                                                           \
@@ -212,7 +210,7 @@
             Source::dimension_type,                                         \
             heterogeneous_system<                                           \
                 heterogeneous_system_pair<                                  \
-                    unscale<Destination>::type,                             \
+                    Destination,                                            \
                     Source::dimension_type                                  \
                 >                                                           \
             >                                                               \
@@ -228,9 +226,7 @@
 
 /// Defines the conversion factor from a base unit to any other base
 /// unit with the same dimensions.  Must appear at global scope.
-/// If the destination unit is a unit that contains only one
-/// base unit which is raised to the first power (e.g. feet->meters)
-/// the reverse need not be defined.  Does not work with scaling. Sigh.
+/// The reverse need not be defined.  Does not work with scaling. Sigh.
 #define BOOST_UNITS_DEFINE_BASE_CONVERSION_TEMPLATE(Params, Source, Destination, type_, value_)   \
 namespace boost {                                                           \
 namespace units {                                                           \
@@ -238,11 +234,11 @@
     struct base_unit_converter<                                             \
         Source,                                                             \
             unit<                                                           \
-            Source::dimension_type,                                         \
+            typename Source::dimension_type,                                \
             heterogeneous_system<                                           \
                 heterogeneous_system_pair<                                  \
-                    unscale<Destination>::type,                             \
-                    Source::dimension_type                                  \
+                    Destination,                                            \
+                    typename Source::dimension_type                         \
                 >                                                           \
             >                                                               \
         >                                                                   \
@@ -291,7 +287,7 @@
 namespace boost {                                                           \
 namespace units {                                                           \
     template<BOOST_PP_SEQ_ENUM(Params)>                                     \
-    struct base_unit_converter<Source, reduce_unit<Destination>::type>      \
+    struct base_unit_converter<Source, Destination>                         \
     {                                                                       \
         typedef type_ type;                                                 \
         static type value() { return(value_); }                             \