[Boost-commit] svn:boost r45403 - in sandbox/units: boost/units/systems libs/units/example

From: steven_at_[hidden]
Date: 2008-05-15 15:47:10

Author: steven_watanabe
Date: 2008-05-15 15:47:10 EDT (Thu, 15 May 2008)
New Revision: 45403
URL: http://svn.boost.org/trac/boost/changeset/45403

Log:
Removed all explicit ::unit_types from conversion definitions to keep msvc 7.1 happy
Text files modified: 
   sandbox/units/boost/units/systems/base_units.hpp        |     8 ++++----                                
   sandbox/units/libs/units/example/non_base_dimension.cpp |     2 +-                                      
   sandbox/units/libs/units/example/radar_beam_height.cpp  |     4 ++--                                    
   3 files changed, 7 insertions(+), 7 deletions(-)

Modified: sandbox/units/boost/units/systems/base_units.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units.hpp	2008-05-15 15:47:10 EDT (Thu, 15 May 2008)
@@ -46,9 +46,9 @@
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::yard_base_unit, boost::units::meter_base_unit, double, 0.9144);
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::mile_base_unit, boost::units::meter_base_unit, double, 1609.344);
 
-BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::mile_base_unit, boost::units::yard_base_unit::unit_type, double, 1760.0);
-BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::mile_base_unit, boost::units::foot_base_unit::unit_type, double, 5280.0);
-BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::mile_base_unit, boost::units::inch_base_unit::unit_type, double, 63360.0);
+BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::mile_base_unit, boost::units::yard_base_unit, double, 1760.0);
+BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::mile_base_unit, boost::units::foot_base_unit, double, 5280.0);
+BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::mile_base_unit, boost::units::inch_base_unit, double, 63360.0);
 
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::yard_base_unit, boost::units::foot_base_unit, double, 3.0);
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::yard_base_unit, boost::units::inch_base_unit, double, 36.0);
@@ -59,7 +59,7 @@
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::hour_base_unit, boost::units::second_base_unit, double, 3600.0);
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::minute_base_unit, boost::units::second_base_unit, double, 60.0);
 
-BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::kelvin_base_unit, boost::units::celsius_base_unit::unit_type, one, one());
+BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::kelvin_base_unit, boost::units::celsius_base_unit, one, one());
 BOOST_UNITS_DEFINE_CONVERSION_OFFSET(boost::units::kelvin_base_unit, boost::units::celsius_base_unit, double, -273.15);
 
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::kelvin_base_unit, boost::units::fahrenheit_base_unit, double, 9.0/5.0);

Modified: sandbox/units/libs/units/example/non_base_dimension.cpp
==============================================================================
--- sandbox/units/libs/units/example/non_base_dimension.cpp	(original)
+++ sandbox/units/libs/units/example/non_base_dimension.cpp	2008-05-15 15:47:10 EDT (Thu, 15 May 2008)
@@ -73,7 +73,7 @@
 } // namespace boost
 
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::imperial_gallon_tag,
-                                     boost::units::us_gallon_tag::unit_type,
+                                     boost::units::us_gallon_tag,
                                      double, 1.2009499255);
 
 using namespace boost::units;

Modified: sandbox/units/libs/units/example/radar_beam_height.cpp
==============================================================================
--- sandbox/units/libs/units/example/radar_beam_height.cpp	(original)
+++ sandbox/units/libs/units/example/radar_beam_height.cpp	2008-05-15 15:47:10 EDT (Thu, 15 May 2008)
@@ -72,7 +72,7 @@
 } // namespace boost
 
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::nautical::length_base_unit,
-                                     boost::units::meter_base_unit::unit_type,
+                                     boost::units::meter_base_unit,
                                      double, 1.852e3);
 
 namespace boost {
@@ -104,7 +104,7 @@
 } // namespace boost
 
 BOOST_UNITS_DEFINE_CONVERSION_FACTOR(boost::units::imperial::length_base_unit,
-                                     boost::units::meter_base_unit::unit_type,
+                                     boost::units::meter_base_unit,
                                      double, 1.0/3.28083989501312);
 
 namespace boost {