|
|
Boost-Commit : |
From: matthiasschabel_at_[hidden]
Date: 2007-05-31 14:36:56
Author: matthiasschabel
Date: 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
New Revision: 4387
URL: http://svn.boost.org/trac/boost/changeset/4387
Log:
naming changes for consistency _dim -> _dimension
Text files modified:
sandbox/units/boost/units/absolute.hpp | 2
sandbox/units/boost/units/systems/angle/degrees.hpp | 2
sandbox/units/boost/units/systems/angle/gradians.hpp | 2
sandbox/units/boost/units/systems/base_units.hpp | 252 ++++++++-------------------------------
sandbox/units/boost/units/systems/cgs/acceleration.hpp | 3
sandbox/units/boost/units/systems/cgs/area.hpp | 2
sandbox/units/boost/units/systems/cgs/base.hpp | 8
sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp | 3
sandbox/units/boost/units/systems/cgs/energy.hpp | 3
sandbox/units/boost/units/systems/cgs/force.hpp | 3
sandbox/units/boost/units/systems/cgs/frequency.hpp | 3
sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp | 3
sandbox/units/boost/units/systems/cgs/mass_density.hpp | 3
sandbox/units/boost/units/systems/cgs/momentum.hpp | 3
sandbox/units/boost/units/systems/cgs/power.hpp | 3
sandbox/units/boost/units/systems/cgs/pressure.hpp | 3
sandbox/units/boost/units/systems/cgs/velocity.hpp | 3
sandbox/units/boost/units/systems/cgs/volume.hpp | 3
sandbox/units/boost/units/systems/cgs/wavenumber.hpp | 3
sandbox/units/boost/units/systems/derived_dimensions/absorbed_dose_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/action_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/activity_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/angular_velocity_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/area_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/dose_equivalent_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/energy_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/force_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/illuminance_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/luminance_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/luminous_flux_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/power_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/specific_volume_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/stress_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/surface_density_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/volume_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp | 2
sandbox/units/boost/units/systems/physical_units.hpp | 46 ------
sandbox/units/boost/units/systems/si/absorbed_dose.hpp | 3
sandbox/units/boost/units/systems/si/acceleration.hpp | 3
sandbox/units/boost/units/systems/si/action.hpp | 3
sandbox/units/boost/units/systems/si/activity.hpp | 3
sandbox/units/boost/units/systems/si/angular_velocity.hpp | 3
sandbox/units/boost/units/systems/si/area.hpp | 3
sandbox/units/boost/units/systems/si/base.hpp | 14 +
sandbox/units/boost/units/systems/si/dose_equivalent.hpp | 3
sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp | 3
sandbox/units/boost/units/systems/si/energy.hpp | 3
sandbox/units/boost/units/systems/si/force.hpp | 3
sandbox/units/boost/units/systems/si/frequency.hpp | 3
sandbox/units/boost/units/systems/si/illuminance.hpp | 3
sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp | 3
sandbox/units/boost/units/systems/si/luminous_flux.hpp | 3
sandbox/units/boost/units/systems/si/mass_density.hpp | 3
sandbox/units/boost/units/systems/si/momentum.hpp | 3
sandbox/units/boost/units/systems/si/power.hpp | 3
sandbox/units/boost/units/systems/si/pressure.hpp | 3
sandbox/units/boost/units/systems/si/surface_density.hpp | 3
sandbox/units/boost/units/systems/si/velocity.hpp | 3
sandbox/units/boost/units/systems/si/volume.hpp | 3
sandbox/units/boost/units/systems/si/wavenumber.hpp | 3
sandbox/units/boost/units/systems/temperature/celsius.hpp | 2
sandbox/units/boost/units/systems/temperature/fahrenheit.hpp | 2
70 files changed, 173 insertions(+), 314 deletions(-)
Modified: sandbox/units/boost/units/absolute.hpp
==============================================================================
--- sandbox/units/boost/units/absolute.hpp (original)
+++ sandbox/units/boost/units/absolute.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -131,7 +131,7 @@
/// Defines the offset between two absolute units.
/// Requires the value to be in the destination units e.g
/// @code
-/// BOOST_UNITS_DEFINE_AFFINE_CONVERSION(celsius_tag, fahrenheit_tag::unit_type, double, 32.0);
+/// BOOST_UNITS_DEFINE_AFFINE_CONVERSION(celsius_base_unit, fahrenheit_base_unit::unit_type, double, 32.0);
/// @endcode
/// @c BOOST_UNITS_DEFINE_CONVERSION is also necessary to
/// specify the conversion factor. Like @c BOOST_UNITS_DEFINE_CONVERSION
Modified: sandbox/units/boost/units/systems/angle/degrees.hpp
==============================================================================
--- sandbox/units/boost/units/systems/angle/degrees.hpp (original)
+++ sandbox/units/boost/units/systems/angle/degrees.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -27,7 +27,7 @@
namespace degree {
-typedef make_system<degree_tag>::type system;
+typedef make_system<degree_base_unit>::type system;
typedef unit<dimensionless_type,system> dimensionless;
typedef unit<plane_angle_dimension,system> plane_angle; ///< angle degree unit constant
Modified: sandbox/units/boost/units/systems/angle/gradians.hpp
==============================================================================
--- sandbox/units/boost/units/systems/angle/gradians.hpp (original)
+++ sandbox/units/boost/units/systems/angle/gradians.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -27,7 +27,7 @@
namespace gradian {
-typedef make_system<gradian_tag>::type system;
+typedef make_system<gradian_base_unit>::type system;
typedef unit<dimensionless_type,system> dimensionless;
typedef unit<plane_angle_dimension,system> plane_angle; ///< angle gradian unit constant
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 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -15,204 +15,60 @@
#include <boost/units/config.hpp>
#include <boost/units/base_unit.hpp>
-#include <boost/units/scaled_base_unit.hpp>
+//#include <boost/units/scaled_base_unit.hpp>
#include <boost/units/absolute.hpp>
-#include <boost/units/systems/physical_units.hpp>
-namespace boost {
+#include <boost/units/systems/base_units/ampere_base_unit.hpp>
+#include <boost/units/systems/base_units/biot_base_unit.hpp>
+#include <boost/units/systems/base_units/candela_base_unit.hpp>
+#include <boost/units/systems/base_units/celsius_base_unit.hpp>
+#include <boost/units/systems/base_units/centimeter_base_unit.hpp>
+#include <boost/units/systems/base_units/degree_base_unit.hpp>
+#include <boost/units/systems/base_units/fahrenheit_base_unit.hpp>
+#include <boost/units/systems/base_units/foot_base_unit.hpp>
+#include <boost/units/systems/base_units/gradian_base_unit.hpp>
+#include <boost/units/systems/base_units/gram_base_unit.hpp>
+#include <boost/units/systems/base_units/hour_base_unit.hpp>
+#include <boost/units/systems/base_units/inch_base_unit.hpp>
+#include <boost/units/systems/base_units/kelvin_base_unit.hpp>
+#include <boost/units/systems/base_units/kilogram_base_unit.hpp>
+#include <boost/units/systems/base_units/meter_base_unit.hpp>
+#include <boost/units/systems/base_units/mile_base_unit.hpp>
+#include <boost/units/systems/base_units/minute_base_unit.hpp>
+#include <boost/units/systems/base_units/mole_base_unit.hpp>
+#include <boost/units/systems/base_units/radian_base_unit.hpp>
+#include <boost/units/systems/base_units/second_base_unit.hpp>
+#include <boost/units/systems/base_units/steradian_base_unit.hpp>
+#include <boost/units/systems/base_units/yard_base_unit.hpp>
+
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::meter_base_unit, boost::units::foot_base_unit::unit_type, double, 0.3048);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::meter_base_unit, boost::units::inch_base_unit::unit_type, double, 25.4e-3);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::meter_base_unit, boost::units::yard_base_unit::unit_type, double, 0.9144);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::meter_base_unit, boost::units::mile_base_unit::unit_type, double, 1609.344);
+
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::mile_base_unit, boost::units::yard_base_unit::unit_type, double, 1760.0);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::mile_base_unit, boost::units::foot_base_unit::unit_type, double, 5280.0);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::mile_base_unit, boost::units::inch_base_unit::unit_type, double, 63360.0);
+
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::yard_base_unit, boost::units::foot_base_unit::unit_type, double, 3.0);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::yard_base_unit, boost::units::inch_base_unit::unit_type, double, 36.0);
+
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::foot_base_unit, boost::units::inch_base_unit::unit_type, double, 12.0);
+
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::hour_base_unit, boost::units::minute_base_unit::unit_type, double, 60.0);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::hour_base_unit, boost::units::second_base_unit::unit_type, double, 3600.0);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::minute_base_unit, boost::units::second_base_unit::unit_type, double, 60.0);
+
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::kelvin_base_unit, boost::units::celsius_base_unit::unit_type, one, one());
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::kelvin_base_unit, boost::units::fahrenheit_base_unit::unit_type, double, 9.0/5.0);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::celsius_base_unit, boost::units::fahrenheit_base_unit::unit_type, double, 9.0/5.0);
+
+BOOST_UNITS_DEFINE_AFFINE_CONVERSION(boost::units::kelvin_base_unit::unit_type, boost::units::celsius_base_unit::unit_type, double, -273.15);
+BOOST_UNITS_DEFINE_AFFINE_CONVERSION(boost::units::kelvin_base_unit::unit_type, boost::units::fahrenheit_base_unit::unit_type, double, -273.15 * 9.0 / 5.0 + 32.0);
+BOOST_UNITS_DEFINE_AFFINE_CONVERSION(boost::units::celsius_base_unit::unit_type, boost::units::fahrenheit_base_unit::unit_type, double, 32.0);
+
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::radian_base_unit, boost::units::degree_base_unit::unit_type, double, 180/3.14159265358979323846);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::radian_base_unit, boost::units::gradian_base_unit::unit_type, double, 200/3.14159265358979323846);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::degree_base_unit, boost::units::gradian_base_unit::unit_type, double, 10/9.);
-namespace units {
-
-struct meter_tag : public base_unit<meter_tag, length_dimension, -20>
-{
- static std::string name() { return("meter"); }
- static std::string symbol() { return("m"); }
-};
-
-struct foot_tag : public base_unit<foot_tag, length_dimension, -19>
-{
- static std::string name() { return("foot"); }
- static std::string symbol() { return("ft"); }
-};
-
-struct inch_tag : public base_unit<inch_tag, length_dimension, -18>
-{
- static std::string name() { return("inch"); }
- static std::string symbol() { return("in"); }
-};
-
-struct yard_tag : public base_unit<yard_tag, length_dimension, -17>
-{
- static std::string name() { return("yard"); }
- static std::string symbol() { return("yd"); }
-};
-
-struct mile_tag : public base_unit<mile_tag, length_dimension, -16>
-{
- static std::string name() { return("mile"); }
- static std::string symbol() { return("mi"); }
-};
-
-typedef scaled_base_unit<meter_tag, scale<10, static_rational<-2> > > centimeter_tag;
-
-struct gram_tag : public base_unit<gram_tag, mass_dimension, -15>
-{
- static std::string name() { return("gram"); }
- static std::string symbol() { return("g"); }
-};
-
-typedef scaled_base_unit<gram_tag, scale<10, static_rational<3> > > kilogram_tag;
-
-struct second_tag : public base_unit<second_tag, time_dimension, -14>
-{
- static std::string name() { return("second"); }
- static std::string symbol() { return("s"); }
-};
-
-struct minute_tag : public base_unit<minute_tag, time_dimension, -13>
-{
- static std::string name() { return("minute"); }
- static std::string symbol() { return("min"); }
-};
-
-struct hour_tag : public base_unit<hour_tag, time_dimension, -12>
-{
- static std::string name() { return("foot"); }
- static std::string symbol() { return("ft"); }
-};
-
-struct ampere_tag : public base_unit<ampere_tag, current_dimension, -11>
-{
- static std::string name() { return("ampere"); }
- static std::string symbol() { return("A"); }
-};
-
-struct biot_tag : public base_unit<biot_tag, current_dimension, -10>
-{
- static std::string name() { return("biot"); }
- //static std::string symbol() { return(""); }
-};
-
-struct kelvin_tag : public base_unit<kelvin_tag, temperature_dimension, -9>
-{
- static std::string name() { return("kelvin"); }
- static std::string symbol() { return("K"); }
-};
-
-struct celsius_tag : public base_unit<celsius_tag, temperature_dimension, -8>
-{
- static std::string name() { return("celsius"); }
- static std::string symbol() { return("C"); }
-};
-
-
-struct fahrenheit_tag : public base_unit<fahrenheit_tag, temperature_dimension, -7>
-{
- static std::string name() { return("fahrenheit"); }
- static std::string symbol() { return("F"); }
-};
-
-struct mole_tag : public base_unit<mole_tag, amount_dimension, -6>
-{
- static std::string name() { return("mole"); }
- static std::string symbol() { return("mol"); }
-};
-
-struct candela_tag : public base_unit<candela_tag, luminous_intensity_dimension, -5>
-{
- static std::string name() { return("candela"); }
- static std::string symbol() { return("cd"); }
-};
-
-struct radian_tag : public base_unit<radian_tag, plane_angle_dimension, -4>
-{
- static std::string name() { return("radian"); }
- static std::string symbol() { return("rad"); }
-};
-
-struct degree_tag : public base_unit<degree_tag, plane_angle_dimension, -3>
-{
- static std::string name() { return("degree"); }
- static std::string symbol() { return("deg"); }
-};
-
-struct gradian_tag : public base_unit<gradian_tag, plane_angle_dimension, -2>
-{
- static std::string name() { return("gradian"); }
- static std::string symbol() { return("grad"); }
-};
-
-struct steradian_tag : public base_unit<steradian_tag, solid_angle_dimension, -1>
-{
- static std::string name() { return("steradian"); }
- static std::string symbol() { return("sr"); }
-};
-
-}
-
-}
-
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::meter_tag, boost::units::foot_tag::unit_type, double, 0.3048);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::meter_tag, boost::units::inch_tag::unit_type, double, 25.4e-3);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::meter_tag, boost::units::yard_tag::unit_type, double, 0.9144);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::meter_tag, boost::units::mile_tag::unit_type, double, 1609.344);
-
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::mile_tag, boost::units::yard_tag::unit_type, double, 1760.0);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::mile_tag, boost::units::foot_tag::unit_type, double, 5280.0);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::mile_tag, boost::units::inch_tag::unit_type, double, 63360.0);
-
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::yard_tag, boost::units::foot_tag::unit_type, double, 3.0);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::yard_tag, boost::units::inch_tag::unit_type, double, 36.0);
-
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::foot_tag, boost::units::inch_tag::unit_type, double, 12.0);
-
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::hour_tag, boost::units::minute_tag::unit_type, double, 60.0);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::hour_tag, boost::units::second_tag::unit_type, double, 3600.0);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::minute_tag, boost::units::second_tag::unit_type, double, 60.0);
-
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::kelvin_tag, boost::units::celsius_tag::unit_type, one, one());
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::kelvin_tag, boost::units::fahrenheit_tag::unit_type, double, 9.0/5.0);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::celsius_tag, boost::units::fahrenheit_tag::unit_type, double, 9.0/5.0);
-
-BOOST_UNITS_DEFINE_AFFINE_CONVERSION(boost::units::kelvin_tag::unit_type, boost::units::celsius_tag::unit_type, double, -273.15);
-BOOST_UNITS_DEFINE_AFFINE_CONVERSION(boost::units::kelvin_tag::unit_type, boost::units::fahrenheit_tag::unit_type, double, -273.15 * 9.0 / 5.0 + 32.0);
-BOOST_UNITS_DEFINE_AFFINE_CONVERSION(boost::units::celsius_tag::unit_type, boost::units::fahrenheit_tag::unit_type, double, 32.0);
-
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::radian_tag, boost::units::degree_tag::unit_type, double, 180/3.14159265358979323846);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::radian_tag, boost::units::gradian_tag::unit_type, double, 200/3.14159265358979323846);
-BOOST_UNITS_DEFINE_CONVERSION(boost::units::degree_tag, boost::units::gradian_tag::unit_type, double, 10/9.);
-
-#if BOOST_UNITS_HAS_BOOST_TYPEOF
-
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::meter_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::foot_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::inch_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::yard_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::mile_tag)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::gram_tag)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::second_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::minute_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::hour_tag)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::ampere_tag)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::kelvin_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::fahrenheit_tag)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::mole_tag)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::candela_tag)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::radian_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::degree_tag)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::gradian_tag)
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::steradian_tag)
-
-#endif
-
-#endif
+#endif // BOOST_UNITS_OTHER_UNITS_HPP_INCLUDED
Modified: sandbox/units/boost/units/systems/cgs/acceleration.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/acceleration.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/acceleration.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_ACCELERATION_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<acceleration_dim,CGS::system> acceleration;
+typedef unit<acceleration_dimension,CGS::system> acceleration;
BOOST_UNITS_STATIC_CONSTANT(gal,acceleration);
BOOST_UNITS_STATIC_CONSTANT(gals,acceleration);
Modified: sandbox/units/boost/units/systems/cgs/area.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/area.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/area.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@
namespace CGS {
-typedef unit<area_dim,CGS::system> area;
+typedef unit<area_dimension,CGS::system> area;
BOOST_UNITS_STATIC_CONSTANT(square_centimeter,area);
BOOST_UNITS_STATIC_CONSTANT(square_centimeters,area);
Modified: sandbox/units/boost/units/systems/cgs/base.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/base.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/base.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -17,8 +17,10 @@
#include <boost/units/static_constant.hpp>
#include <boost/units/unit.hpp>
#include <boost/units/make_system.hpp>
-#include <boost/units/systems/physical_units.hpp>
-#include <boost/units/systems/base_units.hpp>
+
+#include <boost/units/systems/base_units/centimeter_base_unit.hpp>
+#include <boost/units/systems/base_units/gram_base_unit.hpp>
+#include <boost/units/systems/base_units/second_base_unit.hpp>
namespace boost {
@@ -27,7 +29,7 @@
namespace CGS {
/// placeholder class defining CGS unit system
-typedef make_system<centimeter_tag, gram_tag, second_tag>::type system;
+typedef make_system<centimeter_base_unit, gram_base_unit, second_base_unit>::type system;
/// various unit typedefs for convenience
typedef unit<dimensionless_type,system> dimensionless;
Modified: sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_DYNAMIC_VISCOSITY_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<dynamic_viscosity_dim,CGS::system> dynamic_viscosity;
+typedef unit<dynamic_viscosity_dimension,CGS::system> dynamic_viscosity;
BOOST_UNITS_STATIC_CONSTANT(poise,dynamic_viscosity);
Modified: sandbox/units/boost/units/systems/cgs/energy.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/energy.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/energy.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_ENERGY_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/energy_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<energy_dim,CGS::system> energy;
+typedef unit<energy_dimension,CGS::system> energy;
BOOST_UNITS_STATIC_CONSTANT(erg,energy);
BOOST_UNITS_STATIC_CONSTANT(ergs,energy);
Modified: sandbox/units/boost/units/systems/cgs/force.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/force.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/force.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_FORCE_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/force_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<force_dim,CGS::system> force;
+typedef unit<force_dimension,CGS::system> force;
BOOST_UNITS_STATIC_CONSTANT(dyne,force);
BOOST_UNITS_STATIC_CONSTANT(dynes,force);
Modified: sandbox/units/boost/units/systems/cgs/frequency.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/frequency.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/frequency.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_FREQUENCY_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<frequency_dim,CGS::system> frequency;
+typedef unit<frequency_dimension,CGS::system> frequency;
} // namespace CGS
Modified: sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_KINEMATIC_VISCOSITY_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<kinematic_viscosity_dim,CGS::system> kinematic_viscosity;
+typedef unit<kinematic_viscosity_dimension,CGS::system> kinematic_viscosity;
BOOST_UNITS_STATIC_CONSTANT(stoke,kinematic_viscosity);
BOOST_UNITS_STATIC_CONSTANT(stokes,kinematic_viscosity);
Modified: sandbox/units/boost/units/systems/cgs/mass_density.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/mass_density.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/mass_density.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_MASS_DENSITY_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<mass_density_dim,CGS::system> mass_density;
+typedef unit<mass_density_dimension,CGS::system> mass_density;
} // namespace CGS
Modified: sandbox/units/boost/units/systems/cgs/momentum.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/momentum.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/momentum.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_MOMENTUM_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<momentum_dim,CGS::system> momentum;
+typedef unit<momentum_dimension,CGS::system> momentum;
} // namespace CGS
Modified: sandbox/units/boost/units/systems/cgs/power.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/power.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/power.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_POWER_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/power_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<power_dim,CGS::system> power;
+typedef unit<power_dimension,CGS::system> power;
} // namespace CGS
Modified: sandbox/units/boost/units/systems/cgs/pressure.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/pressure.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/pressure.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_PRESSURE_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<pressure_dim,CGS::system> pressure;
+typedef unit<pressure_dimension,CGS::system> pressure;
BOOST_UNITS_STATIC_CONSTANT(barye,pressure);
BOOST_UNITS_STATIC_CONSTANT(baryes,pressure);
Modified: sandbox/units/boost/units/systems/cgs/velocity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/velocity.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/velocity.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_VELOCITY_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<velocity_dim,CGS::system> velocity;
+typedef unit<velocity_dimension,CGS::system> velocity;
BOOST_UNITS_STATIC_CONSTANT(centimeter_per_second,velocity);
BOOST_UNITS_STATIC_CONSTANT(centimeters_per_second,velocity);
Modified: sandbox/units/boost/units/systems/cgs/volume.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/volume.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/volume.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_VOLUME_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/volume_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<volume_dim,CGS::system> volume;
+typedef unit<volume_dimension,CGS::system> volume;
BOOST_UNITS_STATIC_CONSTANT(cubic_centimeter,volume);
BOOST_UNITS_STATIC_CONSTANT(cubic_centimeters,volume);
Modified: sandbox/units/boost/units/systems/cgs/wavenumber.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/wavenumber.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/wavenumber.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CGS_WAVENUMBER_HPP
#include <boost/units/systems/cgs/base.hpp>
+#include <boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace CGS {
-typedef unit<wavenumber_dim,CGS::system> wavenumber;
+typedef unit<wavenumber_dimension,CGS::system> wavenumber;
BOOST_UNITS_STATIC_CONSTANT(kayser,wavenumber);
BOOST_UNITS_STATIC_CONSTANT(kaysers,wavenumber);
Modified: sandbox/units/boost/units/systems/derived_dimensions/absorbed_dose_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/absorbed_dose_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/absorbed_dose_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for absorbed dose : L^2 T^-2
-typedef derived_dimension<length_base_dimension,2,time_base_dimension,-2>::type absorbed_dose_dim;
+typedef derived_dimension<length_base_dimension,2,time_base_dimension,-2>::type absorbed_dose_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for acceleration : L T^-2
-typedef derived_dimension<length_base_dimension,1,time_base_dimension,-2>::type acceleration_dim;
+typedef derived_dimension<length_base_dimension,1,time_base_dimension,-2>::type acceleration_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/action_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/action_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/action_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for action : L^2 M T^-1
-typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-1>::type action_dim;
+typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-1>::type action_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/activity_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/activity_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/activity_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@
namespace units {
/// derived dimension for activity : T^-1
-typedef derived_dimension<time_base_dimension,-1>::type activity_dim;
+typedef derived_dimension<time_base_dimension,-1>::type activity_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/angular_velocity_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/angular_velocity_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/angular_velocity_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for angular velocity : T^-1 QP
-typedef derived_dimension<time_base_dimension,-1,plane_angle_base_dimension,1>::type angular_velocity_dim;
+typedef derived_dimension<time_base_dimension,-1,plane_angle_base_dimension,1>::type angular_velocity_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/area_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/area_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/area_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@
namespace units {
/// derived dimension for area : L^2
-typedef derived_dimension<length_base_dimension,2>::type area_dim;
+typedef derived_dimension<length_base_dimension,2>::type area_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/dose_equivalent_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/dose_equivalent_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/dose_equivalent_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for dose equivalent : L^2 T^-2
-typedef derived_dimension<length_base_dimension,2,time_base_dimension,-2>::type dose_equivalent_dim;
+typedef derived_dimension<length_base_dimension,2,time_base_dimension,-2>::type dose_equivalent_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -21,7 +21,7 @@
namespace units {
/// derived dimension for dynamic viscosity : M L^-1 T^-1
-typedef derived_dimension<mass_base_dimension,1,length_base_dimension,-1,time_base_dimension,-1>::type dynamic_viscosity_dim;
+typedef derived_dimension<mass_base_dimension,1,length_base_dimension,-1,time_base_dimension,-1>::type dynamic_viscosity_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/energy_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/energy_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/energy_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -21,7 +21,7 @@
namespace units {
/// derived dimension for energy : L^2 M T^-2
-typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-2>::type energy_dim;
+typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-2>::type energy_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/force_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/force_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/force_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -21,7 +21,7 @@
namespace units {
/// derived dimension for force : L M T^-2
-typedef derived_dimension<length_base_dimension,1,mass_base_dimension,1,time_base_dimension,-2>::type force_dim;
+typedef derived_dimension<length_base_dimension,1,mass_base_dimension,1,time_base_dimension,-2>::type force_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@
namespace units {
/// derived dimension for frequency : T^-1
-typedef derived_dimension<time_base_dimension,-1>::type frequency_dim;
+typedef derived_dimension<time_base_dimension,-1>::type frequency_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/illuminance_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/illuminance_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/illuminance_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -21,7 +21,7 @@
namespace units {
/// derived dimension for illuminance : L^-2 I QS
-typedef derived_dimension<length_base_dimension,-2,luminous_intensity_base_dimension,1,solid_angle_base_dimension,1>::type illuminance_dim;
+typedef derived_dimension<length_base_dimension,-2,luminous_intensity_base_dimension,1,solid_angle_base_dimension,1>::type illuminance_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for kinematic viscosity : L^2 T^-1
-typedef derived_dimension<length_base_dimension,2,time_base_dimension,-1>::type kinematic_viscosity_dim;
+typedef derived_dimension<length_base_dimension,2,time_base_dimension,-1>::type kinematic_viscosity_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/luminance_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/luminance_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/luminance_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for luminance : L^-2 I
-typedef derived_dimension<length_base_dimension,-2,luminous_intensity_base_dimension,1>::type luminance_dim;
+typedef derived_dimension<length_base_dimension,-2,luminous_intensity_base_dimension,1>::type luminance_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/luminous_flux_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/luminous_flux_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/luminous_flux_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for luminous flux : I QS
-typedef derived_dimension<luminous_intensity_base_dimension,1,solid_angle_base_dimension,1>::type luminous_flux_dim;
+typedef derived_dimension<luminous_intensity_base_dimension,1,solid_angle_base_dimension,1>::type luminous_flux_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for mass density : L^-3 M
-typedef derived_dimension<length_base_dimension,-3,mass_base_dimension,1>::type mass_density_dim;
+typedef derived_dimension<length_base_dimension,-3,mass_base_dimension,1>::type mass_density_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -21,7 +21,7 @@
namespace units {
/// derived dimension for linear momentum : L M T^-1
-typedef derived_dimension<length_base_dimension,1,mass_base_dimension,1,time_base_dimension,-1>::type momentum_dim;
+typedef derived_dimension<length_base_dimension,1,mass_base_dimension,1,time_base_dimension,-1>::type momentum_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/power_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/power_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/power_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -21,7 +21,7 @@
namespace units {
/// derived dimension for power : L^2 M T^-3
-typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-3>::type power_dim;
+typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-3>::type power_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -21,7 +21,7 @@
namespace units {
/// derived dimension for pressure : L^-1 M T^-2
-typedef derived_dimension<length_base_dimension,-1,mass_base_dimension,1,time_base_dimension,-2>::type pressure_dim;
+typedef derived_dimension<length_base_dimension,-1,mass_base_dimension,1,time_base_dimension,-2>::type pressure_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/specific_volume_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/specific_volume_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/specific_volume_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for specific volume : L^3 M^-1
-typedef derived_dimension<length_base_dimension,3,mass_base_dimension,-1>::type specific_volume_dim;
+typedef derived_dimension<length_base_dimension,3,mass_base_dimension,-1>::type specific_volume_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/stress_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/stress_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/stress_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -21,7 +21,7 @@
namespace units {
/// derived dimension for stress : L^-1 M T^-2
-typedef derived_dimension<length_base_dimension,-1,mass_base_dimension,1,time_base_dimension,-2>::type stress_dim;
+typedef derived_dimension<length_base_dimension,-1,mass_base_dimension,1,time_base_dimension,-2>::type stress_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/surface_density_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/surface_density_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/surface_density_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for surface density : L^-2 M
-typedef derived_dimension<length_base_dimension,-2,mass_base_dimension,1>::type surface_density_dim;
+typedef derived_dimension<length_base_dimension,-2,mass_base_dimension,1>::type surface_density_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace units {
/// derived dimension for velocity : L T^-1
-typedef derived_dimension<length_base_dimension,1,time_base_dimension,-1>::type velocity_dim;
+typedef derived_dimension<length_base_dimension,1,time_base_dimension,-1>::type velocity_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/volume_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/volume_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/volume_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@
namespace units {
/// derived dimension for volume : l^3
-typedef derived_dimension<length_base_dimension,3>::type volume_dim;
+typedef derived_dimension<length_base_dimension,3>::type volume_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp (original)
+++ sandbox/units/boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@
namespace units {
/// derived dimension for wavenumber : L^-1
-typedef derived_dimension<length_base_dimension,-1>::type wavenumber_dim;
+typedef derived_dimension<length_base_dimension,-1>::type wavenumber_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_units.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_units.hpp (original)
+++ sandbox/units/boost/units/systems/physical_units.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -11,49 +11,7 @@
#ifndef BOOST_UNITS_PHYSICAL_UNITS_HPP
#define BOOST_UNITS_PHYSICAL_UNITS_HPP
-/// \file
-/// \brief Various definitions to simplify systems of physical units.
-///
-/// \detailed This file includes the seven SI-defined base dimensions as
-/// well as derived dimensions for a number of commonly encountered
-/// physical unit types. Angles and solid angles are technically dimensionless.
-/// However, incorrect use of degrees and radians is a common source of errors,
-/// so we treat them on the same footing as the seven physical dimensions.
-
-#include <boost/units/systems/base_dimensions/amount_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/current_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/length_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/luminous_intensity_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/mass_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/plane_angle_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/solid_angle_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/temperature_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/time_base_dimension.hpp>
-
-#include <boost/units/systems/derived_dimensions/absorbed_dose_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/action_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/activity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/angular_velocity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/area_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/dose_equivalent_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/energy_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/force_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/illuminance_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/luminance_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/luminous_flux_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/power_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/specific_volume_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/stress_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/surface_density_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/volume_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp>
+#include <boost/units/systems/base_dimensions.hpp>
+#include <boost/units/systems/derived_dimensions.hpp>
#endif // BOOST_UNITS_PHYSICAL_UNITS_HPP
Modified: sandbox/units/boost/units/systems/si/absorbed_dose.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/absorbed_dose.hpp (original)
+++ sandbox/units/boost/units/systems/si/absorbed_dose.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_ABSORBED_DOSE_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/absorbed_dose_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<absorbed_dose_dim,SI::system> absorbed_dose;
+typedef unit<absorbed_dose_dimension,SI::system> absorbed_dose;
BOOST_UNITS_STATIC_CONSTANT(gray,absorbed_dose);
BOOST_UNITS_STATIC_CONSTANT(grays,absorbed_dose);
Modified: sandbox/units/boost/units/systems/si/acceleration.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/acceleration.hpp (original)
+++ sandbox/units/boost/units/systems/si/acceleration.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_ACCELERATION_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<acceleration_dim,SI::system> acceleration;
+typedef unit<acceleration_dimension,SI::system> acceleration;
BOOST_UNITS_STATIC_CONSTANT(meter_per_second_squared,acceleration);
BOOST_UNITS_STATIC_CONSTANT(meters_per_second_squared,acceleration);
Modified: sandbox/units/boost/units/systems/si/action.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/action.hpp (original)
+++ sandbox/units/boost/units/systems/si/action.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_ACTION_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/action_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<action_dim,SI::system> action;
+typedef unit<action_dimension,SI::system> action;
} // namespace SI
Modified: sandbox/units/boost/units/systems/si/activity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/activity.hpp (original)
+++ sandbox/units/boost/units/systems/si/activity.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_ACTIVITY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/activity_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<activity_dim,SI::system> activity;
+typedef unit<activity_dimension,SI::system> activity;
BOOST_UNITS_STATIC_CONSTANT(becquerel,activity);
BOOST_UNITS_STATIC_CONSTANT(becquerels,activity);
Modified: sandbox/units/boost/units/systems/si/angular_velocity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/angular_velocity.hpp (original)
+++ sandbox/units/boost/units/systems/si/angular_velocity.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_ANGULAR_VELOCITY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/angular_velocity_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<angular_velocity_dim,SI::system> angular_velocity;
+typedef unit<angular_velocity_dimension,SI::system> angular_velocity;
BOOST_UNITS_STATIC_CONSTANT(radian_per_second,angular_velocity);
BOOST_UNITS_STATIC_CONSTANT(radians_per_second,angular_velocity);
Modified: sandbox/units/boost/units/systems/si/area.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/area.hpp (original)
+++ sandbox/units/boost/units/systems/si/area.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_AREA_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/area_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<area_dim,SI::system> area;
+typedef unit<area_dimension,SI::system> area;
BOOST_UNITS_STATIC_CONSTANT(square_meter,area);
BOOST_UNITS_STATIC_CONSTANT(square_meters,area);
Modified: sandbox/units/boost/units/systems/si/base.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/base.hpp (original)
+++ sandbox/units/boost/units/systems/si/base.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -17,8 +17,16 @@
#include <boost/units/static_constant.hpp>
#include <boost/units/unit.hpp>
#include <boost/units/make_system.hpp>
-#include <boost/units/systems/physical_units.hpp>
-#include <boost/units/systems/base_units.hpp>
+
+#include <boost/units/systems/base_units/meter_base_unit.hpp>
+#include <boost/units/systems/base_units/kilogram_base_unit.hpp>
+#include <boost/units/systems/base_units/second_base_unit.hpp>
+#include <boost/units/systems/base_units/ampere_base_unit.hpp>
+#include <boost/units/systems/base_units/kelvin_base_unit.hpp>
+#include <boost/units/systems/base_units/mole_base_unit.hpp>
+#include <boost/units/systems/base_units/candela_base_unit.hpp>
+#include <boost/units/systems/base_units/radian_base_unit.hpp>
+#include <boost/units/systems/base_units/steradian_base_unit.hpp>
namespace boost {
@@ -27,7 +35,7 @@
namespace SI {
/// placeholder class defining SI unit system
-typedef make_system<meter_tag, kilogram_tag, second_tag, ampere_tag, kelvin_tag, mole_tag, candela_tag, radian_tag, steradian_tag>::type system;
+typedef make_system<meter_base_unit, kilogram_base_unit, second_base_unit, ampere_base_unit, kelvin_base_unit, mole_base_unit, candela_base_unit, radian_base_unit, steradian_base_unit>::type system;
/// dimensionless SI unit
typedef unit<dimensionless_type,system> dimensionless;
Modified: sandbox/units/boost/units/systems/si/dose_equivalent.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/dose_equivalent.hpp (original)
+++ sandbox/units/boost/units/systems/si/dose_equivalent.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_DOSE_EQUIVALENT_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/dose_equivalent_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<dose_equivalent_dim,SI::system> dose_equivalent;
+typedef unit<dose_equivalent_dimension,SI::system> dose_equivalent;
BOOST_UNITS_STATIC_CONSTANT(sievert,dose_equivalent);
BOOST_UNITS_STATIC_CONSTANT(sieverts,dose_equivalent);
Modified: sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp (original)
+++ sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_DYNAMIC_VISCOSITY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<dynamic_viscosity_dim,SI::system> dynamic_viscosity;
+typedef unit<dynamic_viscosity_dimension,SI::system> dynamic_viscosity;
} // namespace SI
Modified: sandbox/units/boost/units/systems/si/energy.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/energy.hpp (original)
+++ sandbox/units/boost/units/systems/si/energy.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_ENERGY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/energy_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<energy_dim,SI::system> energy;
+typedef unit<energy_dimension,SI::system> energy;
BOOST_UNITS_STATIC_CONSTANT(joule,energy);
BOOST_UNITS_STATIC_CONSTANT(joules,energy);
Modified: sandbox/units/boost/units/systems/si/force.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/force.hpp (original)
+++ sandbox/units/boost/units/systems/si/force.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_FORCE_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/force_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<force_dim,SI::system> force;
+typedef unit<force_dimension,SI::system> force;
BOOST_UNITS_STATIC_CONSTANT(newton,force);
BOOST_UNITS_STATIC_CONSTANT(newtons,force);
Modified: sandbox/units/boost/units/systems/si/frequency.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/frequency.hpp (original)
+++ sandbox/units/boost/units/systems/si/frequency.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_FREQUENCY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<frequency_dim,SI::system> frequency;
+typedef unit<frequency_dimension,SI::system> frequency;
BOOST_UNITS_STATIC_CONSTANT(hertz,frequency);
Modified: sandbox/units/boost/units/systems/si/illuminance.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/illuminance.hpp (original)
+++ sandbox/units/boost/units/systems/si/illuminance.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_ILLUMINANCE_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/illuminance_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<illuminance_dim,SI::system> illuminance;
+typedef unit<illuminance_dimension,SI::system> illuminance;
BOOST_UNITS_STATIC_CONSTANT(lux,illuminance);
Modified: sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp (original)
+++ sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_KINEMATIC_VISCOSITY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<kinematic_viscosity_dim,SI::system> kinematic_viscosity;
+typedef unit<kinematic_viscosity_dimension,SI::system> kinematic_viscosity;
} // namespace SI
Modified: sandbox/units/boost/units/systems/si/luminous_flux.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/luminous_flux.hpp (original)
+++ sandbox/units/boost/units/systems/si/luminous_flux.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_LUMINOUS_FLUX_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/luminous_flux_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<luminous_flux_dim,SI::system> luminous_flux;
+typedef unit<luminous_flux_dimension,SI::system> luminous_flux;
BOOST_UNITS_STATIC_CONSTANT(lumen,luminous_flux);
BOOST_UNITS_STATIC_CONSTANT(lumens,luminous_flux);
Modified: sandbox/units/boost/units/systems/si/mass_density.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/mass_density.hpp (original)
+++ sandbox/units/boost/units/systems/si/mass_density.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_MASS_DENSITY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<mass_density_dim,SI::system> mass_density;
+typedef unit<mass_density_dimension,SI::system> mass_density;
BOOST_UNITS_STATIC_CONSTANT(kilogram_per_cubic_meter,mass_density);
BOOST_UNITS_STATIC_CONSTANT(kilograms_per_cubic_meter,mass_density);
Modified: sandbox/units/boost/units/systems/si/momentum.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/momentum.hpp (original)
+++ sandbox/units/boost/units/systems/si/momentum.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_MOMENTUM_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<momentum_dim,SI::system> momentum;
+typedef unit<momentum_dimension,SI::system> momentum;
} // namespace SI
Modified: sandbox/units/boost/units/systems/si/power.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/power.hpp (original)
+++ sandbox/units/boost/units/systems/si/power.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_POWER_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/power_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<power_dim,SI::system> power;
+typedef unit<power_dimension,SI::system> power;
BOOST_UNITS_STATIC_CONSTANT(watt,power);
BOOST_UNITS_STATIC_CONSTANT(watts,power);
Modified: sandbox/units/boost/units/systems/si/pressure.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/pressure.hpp (original)
+++ sandbox/units/boost/units/systems/si/pressure.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_PRESSURE_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<pressure_dim,SI::system> pressure;
+typedef unit<pressure_dimension,SI::system> pressure;
// windef.h #defines pascal on Metrowerks compilers
#if defined(__MWERKS__)
Modified: sandbox/units/boost/units/systems/si/surface_density.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/surface_density.hpp (original)
+++ sandbox/units/boost/units/systems/si/surface_density.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_SURFACE_DENSITY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/surface_density_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<surface_density_dim,SI::system> surface_density;
+typedef unit<surface_density_dimension,SI::system> surface_density;
BOOST_UNITS_STATIC_CONSTANT(kilogram_per_square_meter,surface_density);
BOOST_UNITS_STATIC_CONSTANT(kilograms_per_square_meter,surface_density);
Modified: sandbox/units/boost/units/systems/si/velocity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/velocity.hpp (original)
+++ sandbox/units/boost/units/systems/si/velocity.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_VELOCITY_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<velocity_dim,SI::system> velocity;
+typedef unit<velocity_dimension,SI::system> velocity;
BOOST_UNITS_STATIC_CONSTANT(meter_per_second,velocity);
BOOST_UNITS_STATIC_CONSTANT(meters_per_second,velocity);
Modified: sandbox/units/boost/units/systems/si/volume.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/volume.hpp (original)
+++ sandbox/units/boost/units/systems/si/volume.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_VOLUME_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/volume_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<volume_dim,SI::system> volume;
+typedef unit<volume_dimension,SI::system> volume;
BOOST_UNITS_STATIC_CONSTANT(cubic_meter,volume);
BOOST_UNITS_STATIC_CONSTANT(cubic_meters,volume);
Modified: sandbox/units/boost/units/systems/si/wavenumber.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/wavenumber.hpp (original)
+++ sandbox/units/boost/units/systems/si/wavenumber.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -12,6 +12,7 @@
#define BOOST_UNITS_SI_WAVENUMBER_HPP
#include <boost/units/systems/si/base.hpp>
+#include <boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp>
namespace boost {
@@ -19,7 +20,7 @@
namespace SI {
-typedef unit<wavenumber_dim,SI::system> wavenumber;
+typedef unit<wavenumber_dimension,SI::system> wavenumber;
BOOST_UNITS_STATIC_CONSTANT(reciprocal_meter,wavenumber);
BOOST_UNITS_STATIC_CONSTANT(reciprocal_meters,wavenumber);
Modified: sandbox/units/boost/units/systems/temperature/celsius.hpp
==============================================================================
--- sandbox/units/boost/units/systems/temperature/celsius.hpp (original)
+++ sandbox/units/boost/units/systems/temperature/celsius.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -25,7 +25,7 @@
namespace celsius {
-typedef make_system<celsius_tag>::type system;
+typedef make_system<celsius_base_unit>::type system;
typedef unit<temperature_dimension,system> temperature;
Modified: sandbox/units/boost/units/systems/temperature/fahrenheit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/temperature/fahrenheit.hpp (original)
+++ sandbox/units/boost/units/systems/temperature/fahrenheit.hpp 2007-05-31 14:36:50 EDT (Thu, 31 May 2007)
@@ -25,7 +25,7 @@
namespace fahrenheit {
-typedef make_system<fahrenheit_tag>::type system;
+typedef make_system<fahrenheit_base_unit>::type system;
typedef unit<temperature_dimension,system> temperature;
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