Boost-Commit :

Date view	Thread view	Subject view	Author view

From: matthiasschabel_at_[hidden]
Date: 2007-05-31 12:44:30

Next message: matthiasschabel_at_[hidden]: "[Boost-commit] svn:boost r4380"
Previous message: matthiasschabel_at_[hidden]: "[Boost-commit] svn:boost r4378"

Author: matthiasschabel
Date: 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
New Revision: 4379
URL: http://svn.boost.org/trac/boost/changeset/4379

Log:
naming changes to make typedefs more transparent

Text files modified:
   sandbox/units/boost/units/systems/abstract.hpp | 36 ++--
   sandbox/units/boost/units/systems/angle/degrees.hpp | 2
   sandbox/units/boost/units/systems/angle/gradians.hpp | 2
   sandbox/units/boost/units/systems/angle/revolutions.hpp | 4
   sandbox/units/boost/units/systems/base_units.hpp | 57 +++++--
   sandbox/units/boost/units/systems/cgs/acceleration.hpp | 2
   sandbox/units/boost/units/systems/cgs/area.hpp | 2
   sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp | 2
   sandbox/units/boost/units/systems/cgs/energy.hpp | 2
   sandbox/units/boost/units/systems/cgs/force.hpp | 2
   sandbox/units/boost/units/systems/cgs/frequency.hpp | 2
   sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp | 2
   sandbox/units/boost/units/systems/cgs/length.hpp | 2
   sandbox/units/boost/units/systems/cgs/mass.hpp | 2
   sandbox/units/boost/units/systems/cgs/mass_density.hpp | 2
   sandbox/units/boost/units/systems/cgs/momentum.hpp | 2
   sandbox/units/boost/units/systems/cgs/power.hpp | 2
   sandbox/units/boost/units/systems/cgs/pressure.hpp | 2
   sandbox/units/boost/units/systems/cgs/time.hpp | 2
   sandbox/units/boost/units/systems/cgs/velocity.hpp | 2
   sandbox/units/boost/units/systems/cgs/volume.hpp | 2
   sandbox/units/boost/units/systems/cgs/wavenumber.hpp | 2
   sandbox/units/boost/units/systems/constants.hpp | 35 ++++
   sandbox/units/boost/units/systems/other/temperature_fahrenheit.hpp | 24 +-
   sandbox/units/boost/units/systems/physical_units.hpp | 182 +++++----------------------
   sandbox/units/boost/units/systems/si/absorbed_dose.hpp | 2
   sandbox/units/boost/units/systems/si/acceleration.hpp | 2
   sandbox/units/boost/units/systems/si/action.hpp | 2
   sandbox/units/boost/units/systems/si/activity.hpp | 2
   sandbox/units/boost/units/systems/si/amount.hpp | 2
   sandbox/units/boost/units/systems/si/angular_velocity.hpp | 2
   sandbox/units/boost/units/systems/si/area.hpp | 2
   sandbox/units/boost/units/systems/si/capacitance.hpp | 2
   sandbox/units/boost/units/systems/si/catalytic_activity.hpp | 4
   sandbox/units/boost/units/systems/si/codata/atomic_and_nuclear_constants.hpp | 265 +--------------------------------------
   sandbox/units/boost/units/systems/si/codata/electromagnetic_constants.hpp | 2
   sandbox/units/boost/units/systems/si/codata/physico-chemical_constants.hpp | 2
   sandbox/units/boost/units/systems/si/codata/typedefs.hpp | 2
   sandbox/units/boost/units/systems/si/codata/universal_constants.hpp | 2
   sandbox/units/boost/units/systems/si/codata_constants.hpp | 26 ---
   sandbox/units/boost/units/systems/si/conductance.hpp | 2
   sandbox/units/boost/units/systems/si/conductivity.hpp | 2
   sandbox/units/boost/units/systems/si/current.hpp | 2
   sandbox/units/boost/units/systems/si/dose_equivalent.hpp | 2
   sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp | 2
   sandbox/units/boost/units/systems/si/electric_charge.hpp | 2
   sandbox/units/boost/units/systems/si/electric_potential.hpp | 2
   sandbox/units/boost/units/systems/si/energy.hpp | 2
   sandbox/units/boost/units/systems/si/force.hpp | 2
   sandbox/units/boost/units/systems/si/frequency.hpp | 2
   sandbox/units/boost/units/systems/si/illuminance.hpp | 2
   sandbox/units/boost/units/systems/si/impedance.hpp | 2
   sandbox/units/boost/units/systems/si/inductance.hpp | 2
   sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp | 2
   sandbox/units/boost/units/systems/si/length.hpp | 2
   sandbox/units/boost/units/systems/si/luminous_flux.hpp | 2
   sandbox/units/boost/units/systems/si/luminous_intensity.hpp | 2
   sandbox/units/boost/units/systems/si/magnetic_field_intensity.hpp | 2
   sandbox/units/boost/units/systems/si/magnetic_flux.hpp | 2
   sandbox/units/boost/units/systems/si/magnetic_flux_density.hpp | 2
   sandbox/units/boost/units/systems/si/mass.hpp | 2
   sandbox/units/boost/units/systems/si/mass_density.hpp | 2
   sandbox/units/boost/units/systems/si/momentum.hpp | 2
   sandbox/units/boost/units/systems/si/permeability.hpp | 2
   sandbox/units/boost/units/systems/si/permittivity.hpp | 2
   sandbox/units/boost/units/systems/si/plane_angle.hpp | 2
   sandbox/units/boost/units/systems/si/power.hpp | 2
   sandbox/units/boost/units/systems/si/pressure.hpp | 2
   sandbox/units/boost/units/systems/si/reluctance.hpp | 2
   sandbox/units/boost/units/systems/si/resistance.hpp | 2
   sandbox/units/boost/units/systems/si/resistivity.hpp | 2
   sandbox/units/boost/units/systems/si/solid_angle.hpp | 2
   sandbox/units/boost/units/systems/si/surface_density.hpp | 2
   sandbox/units/boost/units/systems/si/temperature.hpp | 2
   sandbox/units/boost/units/systems/si/time.hpp | 2
   sandbox/units/boost/units/systems/si/velocity.hpp | 2
   sandbox/units/boost/units/systems/si/volume.hpp | 2
   sandbox/units/boost/units/systems/si/wavenumber.hpp | 2
   sandbox/units/boost/units/systems/temperature/celsius.hpp | 2
   sandbox/units/boost/units/systems/temperature/fahrenheit.hpp | 2
   sandbox/units/boost/units/systems/trig.hpp | 18 +-
   81 files changed, 226 insertions(+), 567 deletions(-)

Modified: sandbox/units/boost/units/systems/abstract.hpp
==============================================================================
--- sandbox/units/boost/units/systems/abstract.hpp (original)
+++ sandbox/units/boost/units/systems/abstract.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -26,15 +26,15 @@

namespace abstract {

-struct length_unit_tag : base_unit<length_unit_tag, length_type, -30> {};
-struct mass_unit_tag : base_unit<mass_unit_tag, mass_type, -29> {};
-struct time_unit_tag : base_unit<time_unit_tag, time_type, -28> {};
-struct current_unit_tag : base_unit<current_unit_tag, current_type, -27> {};
-struct temperature_unit_tag : base_unit<temperature_unit_tag, temperature_type, -26> {};
-struct amount_unit_tag : base_unit<amount_unit_tag, amount_type, -25> {};
-struct luminous_intensity_unit_tag : base_unit<luminous_intensity_unit_tag, luminous_intensity_type, -24> {};
-struct plane_angle_unit_tag : base_unit<plane_angle_unit_tag, plane_angle_type, -23> {};
-struct solid_angle_unit_tag : base_unit<solid_angle_unit_tag, solid_angle_type, -22> {};
+struct length_unit_tag : base_unit<length_unit_tag, length_dimension, -30> {};
+struct mass_unit_tag : base_unit<mass_unit_tag, mass_dimension, -29> {};
+struct time_unit_tag : base_unit<time_unit_tag, time_dimension, -28> {};
+struct current_unit_tag : base_unit<current_unit_tag, current_dimension, -27> {};
+struct temperature_unit_tag : base_unit<temperature_unit_tag, temperature_dimension, -26> {};
+struct amount_unit_tag : base_unit<amount_unit_tag, amount_dimension, -25> {};
+struct luminous_intensity_unit_tag : base_unit<luminous_intensity_unit_tag, luminous_intensity_dimension, -24> {};
+struct plane_angle_unit_tag : base_unit<plane_angle_unit_tag, plane_angle_dimension, -23> {};
+struct solid_angle_unit_tag : base_unit<solid_angle_unit_tag, solid_angle_dimension, -22> {};

typedef make_system<
length_unit_tag,
@@ -48,15 +48,15 @@
solid_angle_unit_tag
>::type system;

-typedef unit<length_type,system> length; ///< abstract unit of length
-typedef unit<mass_type,system> mass; ///< abstract unit of mass
-typedef unit<time_type,system> time; ///< abstract unit of time
-typedef unit<current_type,system> current; ///< abstract unit of current
-typedef unit<temperature_type,system> temperature; ///< abstract unit of temperature
-typedef unit<amount_type,system> amount; ///< abstract unit of amount
-typedef unit<luminous_intensity_type,system> luminous_intensity; ///< abstract unit of luminous intensity
-typedef unit<plane_angle_type,system> plane_angle; ///< abstract unit of plane angle
-typedef unit<solid_angle_type,system> solid_angle; ///< abstract unit of solid angle
+typedef unit<length_dimension,system> length; ///< abstract unit of length
+typedef unit<mass_dimension,system> mass; ///< abstract unit of mass
+typedef unit<time_dimension,system> time; ///< abstract unit of time
+typedef unit<current_dimension,system> current; ///< abstract unit of current
+typedef unit<temperature_dimension,system> temperature; ///< abstract unit of temperature
+typedef unit<amount_dimension,system> amount; ///< abstract unit of amount
+typedef unit<luminous_intensity_dimension,system> luminous_intensity; ///< abstract unit of luminous intensity
+typedef unit<plane_angle_dimension,system> plane_angle; ///< abstract unit of plane angle
+typedef unit<solid_angle_dimension,system> solid_angle; ///< abstract unit of solid angle

} // namespace abstract

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -30,7 +30,7 @@
typedef make_system<degree_tag>::type system;

typedef unit<dimensionless_type,system> dimensionless;
-typedef unit<plane_angle_type,system> plane_angle; ///< angle degree unit constant
+typedef unit<plane_angle_dimension,system> plane_angle; ///< angle degree unit constant

BOOST_UNITS_STATIC_CONSTANT(degree,plane_angle);
BOOST_UNITS_STATIC_CONSTANT(degrees,plane_angle);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -30,7 +30,7 @@
typedef make_system<gradian_tag>::type system;

typedef unit<dimensionless_type,system> dimensionless;
-typedef unit<plane_angle_type,system> plane_angle; ///< angle gradian unit constant
+typedef unit<plane_angle_dimension,system> plane_angle; ///< angle gradian unit constant

BOOST_UNITS_STATIC_CONSTANT(gradian,plane_angle);
BOOST_UNITS_STATIC_CONSTANT(gradians,plane_angle);

Modified: sandbox/units/boost/units/systems/angle/revolutions.hpp
==============================================================================
--- sandbox/units/boost/units/systems/angle/revolutions.hpp (original)
+++ sandbox/units/boost/units/systems/angle/revolutions.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -51,7 +51,7 @@
typedef homogeneous_system<system_tag> system; ///< revolution unit system

typedef unit<dimensionless_type,system> dimensionless;
-typedef unit<plane_angle_dim,system> plane_angle; ///< angle revolution unit constant
+typedef unit<plane_angle_dimension,system> plane_angle; ///< angle revolution unit constant

BOOST_UNITS_STATIC_CONSTANT(revolution,plane_angle);
BOOST_UNITS_STATIC_CONSTANT(revolutions,plane_angle);
@@ -59,7 +59,7 @@
} // namespace revolution

template<>
-struct base_unit_info<plane_angle_base_dim,revolution::system_tag>
+struct base_unit_info<plane_angle_base_dimension,revolution::system_tag>
{
static std::string name() { return "revolution"; }
static std::string symbol() { return "rev"; }

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -23,107 +23,126 @@

namespace units {

-struct meter_tag : public base_unit<meter_tag, length_type, -20>
+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_type, -19>
+
+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_type, -18>
+
+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_type, -17>
+
+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_type, -16>
+
+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_type, -15>
+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_type, -14>
+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_type, -13>
+
+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_type, -12>
+
+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_type, -11>
+struct ampere_tag : public base_unit<ampere_tag, current_dimension, -11>
{
     static std::string name() { return("ampere"); }
     static std::string symbol() { return("A"); }
};

-struct kelvin_tag : public base_unit<kelvin_tag, temperature_type, -9>
+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_type, -8>
+
+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_type, -7>
+
+
+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_type, -6>
+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_type, -5>
+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_type, -4>
+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_type, -3>
+
+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_type, -2>
+
+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_type, -1>
+struct steradian_tag : public base_unit<steradian_tag, solid_angle_dimension, -1>
{
     static std::string name() { return("steradian"); }
     static std::string symbol() { return("sr"); }

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<acceleration_type,CGS::system> acceleration;
+typedef unit<acceleration_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<area_type,CGS::system> area;
+typedef unit<area_dim,CGS::system> area;

BOOST_UNITS_STATIC_CONSTANT(square_centimeter,area);
BOOST_UNITS_STATIC_CONSTANT(square_centimeters,area);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<dynamic_viscosity_type,CGS::system> dynamic_viscosity;
+typedef unit<dynamic_viscosity_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<energy_type,CGS::system> energy;
+typedef unit<energy_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<force_type,CGS::system> force;
+typedef unit<force_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<frequency_type,CGS::system> frequency;
+typedef unit<frequency_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<kinematic_viscosity_type,CGS::system> kinematic_viscosity;
+typedef unit<kinematic_viscosity_dim,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/length.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/length.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/length.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<length_type,CGS::system> length;
+typedef unit<length_dimension,CGS::system> length;

BOOST_UNITS_STATIC_CONSTANT(centimeter,length);
BOOST_UNITS_STATIC_CONSTANT(centimeters,length);

Modified: sandbox/units/boost/units/systems/cgs/mass.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/mass.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/mass.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<mass_type,CGS::system> mass;
+typedef unit<mass_dimension,CGS::system> mass;

BOOST_UNITS_STATIC_CONSTANT(gram,mass);
BOOST_UNITS_STATIC_CONSTANT(grams,mass);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<mass_density_type,CGS::system> mass_density;
+typedef unit<mass_density_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<momentum_type,CGS::system> momentum;
+typedef unit<momentum_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<power_type,CGS::system> power;
+typedef unit<power_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<pressure_type,CGS::system> pressure;
+typedef unit<pressure_dim,CGS::system> pressure;

BOOST_UNITS_STATIC_CONSTANT(barye,pressure);
BOOST_UNITS_STATIC_CONSTANT(baryes,pressure);

Modified: sandbox/units/boost/units/systems/cgs/time.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/time.hpp (original)
+++ sandbox/units/boost/units/systems/cgs/time.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<time_type,CGS::system> time;
+typedef unit<time_dimension,CGS::system> time;

BOOST_UNITS_STATIC_CONSTANT(second,time);
BOOST_UNITS_STATIC_CONSTANT(seconds,time);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<velocity_type,CGS::system> velocity;
+typedef unit<velocity_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<volume_type,CGS::system> volume;
+typedef unit<volume_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace CGS {

-typedef unit<wavenumber_type,CGS::system> wavenumber;
+typedef unit<wavenumber_dim,CGS::system> wavenumber;

BOOST_UNITS_STATIC_CONSTANT(kayser,wavenumber);
BOOST_UNITS_STATIC_CONSTANT(kaysers,wavenumber);

Modified: sandbox/units/boost/units/systems/constants.hpp
==============================================================================
--- sandbox/units/boost/units/systems/constants.hpp (original)
+++ sandbox/units/boost/units/systems/constants.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -24,10 +24,26 @@
namespace units {

template<class Base>
-struct constant : Base {};
+struct constant
+{
+ typedef typename Base::value_type value_type;
+ operator value_type() const { return Base().value(); }
+ value_type value() const { return Base().value(); }
+ value_type uncertainty() const { return Base().uncertainty(); }
+ value_type lower_bound() const { return Base().lower_bound(); }
+ value_type upper_bound() const { return Base().upper_bound(); }
+};

template<class Base>
-struct physical_constant : Base {};
+struct physical_constant
+{
+ typedef typename Base::value_type value_type;
+ operator value_type() const { return Base().value(); }
+ value_type value() const { return Base().value(); }
+ value_type uncertainty() const { return Base().uncertainty(); }
+ value_type lower_bound() const { return Base().lower_bound(); }
+ value_type upper_bound() const { return Base().upper_bound(); }
+};

#define BOOST_UNITS_DEFINE_HELPER(name, symbol, template_name) \
                                                                 \
@@ -125,12 +141,12 @@
     value_type lower_bound() const { return value_-uncertainty_; } \
     value_type upper_bound() const { return value_+uncertainty_; } \
}; \
-BOOST_UNITS_STATIC_CONSTANT(name, boost::units::constant<boost::units::physical_constant<name ## _t> >)
+BOOST_UNITS_STATIC_CONSTANT(name, boost::units::constant<boost::units::physical_constant<name ## _t> >) = { }

// stream output
-template<class Y>
+template<class Char, class Traits, class Y>
inline
-std::ostream& operator<<(std::ostream& os,const physical_constant<Y>& val)
+std::basic_ostream<Char,Traits>& operator<<(std::basic_ostream<Char,Traits>& os,const physical_constant<Y>& val)
{
     boost::io::ios_precision_saver precision_saver(os);
     //boost::io::ios_width_saver width_saver(os);
@@ -167,6 +183,15 @@
     return os;
}

+// stream output
+template<class Char, class Traits, class Y>
+inline
+std::basic_ostream<Char,Traits>& operator<<(std::basic_ostream<Char,Traits>& os,const constant<Y>&)
+{
+ os << Y();
+ return os;
+}
+
} // namespace units

} // namespace boost

Modified: sandbox/units/boost/units/systems/other/temperature_fahrenheit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/other/temperature_fahrenheit.hpp (original)
+++ sandbox/units/boost/units/systems/other/temperature_fahrenheit.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -29,9 +29,9 @@

typedef homogeneous_system<system_tag> system;

-typedef fundamental_dimension<temperature_tag>::type temperature_type;
+typedef fundamental_dimension<temperature_tag>::type temperature_dimension;

-typedef unit<temperature_type,system> temperature;
+typedef unit<temperature_dimension,system> temperature;

BOOST_UNITS_STATIC_CONSTANT(degree,temperature);
BOOST_UNITS_STATIC_CONSTANT(degrees,temperature);
@@ -45,18 +45,18 @@
};

template<>
-struct is_implicitly_convertible< unit<temperature_type,fahrenheit::system>,
- unit<temperature_type,SI::system> > :
+struct is_implicitly_convertible< unit<temperature_dimension,fahrenheit::system>,
+ unit<temperature_dimension,SI::system> > :
     public mpl::true_
{ };

template<class Y>
-class conversion_helper< quantity<unit<temperature_type,fahrenheit::system>,absolute<Y> >,
- quantity<unit<temperature_type,SI::system>,absolute<Y> > >
+class conversion_helper< quantity<unit<temperature_dimension,fahrenheit::system>,absolute<Y> >,
+ quantity<unit<temperature_dimension,SI::system>,absolute<Y> > >
{
     public:
- typedef unit<temperature_type,fahrenheit::system> unit1_type;
- typedef unit<temperature_type,SI::system> unit2_type;
+ typedef unit<temperature_dimension,fahrenheit::system> unit1_type;
+ typedef unit<temperature_dimension,SI::system> unit2_type;

         typedef quantity<unit1_type,absolute<Y> > from_quantity_type;
         typedef quantity<unit2_type,absolute<Y> > to_quantity_type;
@@ -72,12 +72,12 @@
};

template<class Y>
-class conversion_helper< quantity<unit<temperature_type,fahrenheit::system>,Y >,
- quantity<unit<temperature_type,SI::system>,Y > >
+class conversion_helper< quantity<unit<temperature_dimension,fahrenheit::system>,Y >,
+ quantity<unit<temperature_dimension,SI::system>,Y > >
{
     public:
- typedef unit<temperature_type,fahrenheit::system> unit1_type;
- typedef unit<temperature_type,SI::system> unit2_type;
+ typedef unit<temperature_dimension,fahrenheit::system> unit1_type;
+ typedef unit<temperature_dimension,SI::system> unit2_type;

         typedef quantity<unit1_type,relative<Y> > from_quantity_type;
         typedef quantity<unit2_type,relative<Y> > to_quantity_type;

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -11,10 +11,6 @@
#ifndef BOOST_UNITS_PHYSICAL_UNITS_HPP
#define BOOST_UNITS_PHYSICAL_UNITS_HPP

-#include <boost/units/config.hpp>
-#include <boost/units/base_dimension.hpp>
-#include <boost/units/derived_dimension.hpp>
-
/// \file
/// \brief Various definitions to simplify systems of physical units.
///
@@ -24,148 +20,40 @@
/// 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.

-namespace boost {
-
-namespace units {
-
-struct length_dim : boost::units::base_dimension<length_dim, -9> { }; ///> base dimension of length
-struct mass_dim : boost::units::base_dimension<mass_dim,-8> { }; ///> base dimension of mass
-struct time_dim : boost::units::base_dimension<time_dim,-7> { }; ///> base dimension of time
-struct current_dim : boost::units::base_dimension<current_dim,-6> { }; ///> base dimension of current
-struct temperature_dim : boost::units::base_dimension<temperature_dim,-5> { }; ///> base dimension of temperature
-struct amount_dim : boost::units::base_dimension<amount_dim,-4> { }; ///> base dimension of amount
-struct luminous_intensity_dim : boost::units::base_dimension<luminous_intensity_dim,-3> { }; ///> base dimension of luminous intensity
-struct plane_angle_dim : boost::units::base_dimension<plane_angle_dim,-2> { }; ///> base dimension of plane angle
-struct solid_angle_dim : boost::units::base_dimension<solid_angle_dim,-1> { }; ///> base dimension of solid angle
-
-} // namespace units
-
-} // namespace boost
-
-#if BOOST_UNITS_HAS_BOOST_TYPEOF
-
-#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
-
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::length_dim)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::mass_dim)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::time_dim)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::current_dim)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::temperature_dim)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::amount_dim)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::luminous_intensity_dim)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::plane_angle_dim)
-BOOST_TYPEOF_REGISTER_TYPE(boost::units::solid_angle_dim)
-
-#endif
-
-namespace boost {
-
-namespace units {
-
-/// base dimension of length (L)
-typedef length_dim::type length_type;
-
-/// base dimension of mass (M)
-typedef mass_dim::type mass_type;
-
-/// base dimension of time (T)
-typedef time_dim::type time_type;
-
-/// base dimension of electric current (I)
-typedef current_dim::type current_type;
-
-/// base dimension of temperature (Theta)
-typedef temperature_dim::type temperature_type;
-
-/// base dimension of amount of substance (N)
-typedef amount_dim::type amount_type;
-
-/// base dimension of luminous intensity (J)
-typedef luminous_intensity_dim::type luminous_intensity_type;
-
-/// base dimension of planar angle (QP)
-typedef plane_angle_dim::type plane_angle_type;
-
-/// base dimension of solid angle (QS)
-typedef solid_angle_dim::type solid_angle_type;
-
-/// derived dimension for absorbed dose : L^2 T^-2
-typedef derived_dimension<length_dim,2,time_dim,-2>::type absorbed_dose_type;
-
-/// derived dimension for acceleration : L T^-2
-typedef derived_dimension<length_dim,1,time_dim,-2>::type acceleration_type;
-
-/// derived dimension for action : L^2 M T^-1
-typedef derived_dimension<length_dim,2,mass_dim,1,time_dim,-1>::type action_type;
-
-/// derived dimension for activity : T^-1
-typedef derived_dimension<time_dim,-1>::type activity_type;
-
-/// derived dimension for angular velocity : T^-1 QP
-typedef derived_dimension<time_dim,-1,plane_angle_dim,1>::type angular_velocity_type;
-
-/// derived dimension for area : L^2
-typedef derived_dimension<length_dim,2>::type area_type;
-
-/// derived dimension for dose equivalent : L^2 T^-2
-typedef derived_dimension<length_dim,2,time_dim,-2>::type dose_equivalent_type;
-
-/// derived dimension for dynamic viscosity : M L^-1 T^-1
-typedef derived_dimension<mass_dim,1,length_dim,-1,time_dim,-1>::type dynamic_viscosity_type;
-
-/// derived dimension for energy : L^2 M T^-2
-typedef derived_dimension<length_dim,2,mass_dim,1,time_dim,-2>::type energy_type;
-
-/// derived dimension for force : L M T^-2
-typedef derived_dimension<length_dim,1,mass_dim,1,time_dim,-2>::type force_type;
-
-/// derived dimension for frequency : T^-1
-typedef derived_dimension<time_dim,-1>::type frequency_type;
-
-/// derived dimension for illuminance : L^-2 I QS
-typedef derived_dimension<length_dim,-2,luminous_intensity_dim,1,solid_angle_dim,1>::type illuminance_type;
-
-/// derived dimension for kinematic viscosity : L^2 T^-1
-typedef derived_dimension<length_dim,2,time_dim,-1>::type kinematic_viscosity_type;
-
-/// derived dimension for luminance : L^-2 I
-typedef derived_dimension<length_dim,-2,luminous_intensity_dim,1>::type luminance_type;
-
-/// derived dimension for luminous flux : I QS
-typedef derived_dimension<luminous_intensity_dim,1,solid_angle_dim,1>::type luminous_flux_type;
-
-/// derived dimension for mass density : L^-3 M
-typedef derived_dimension<length_dim,-3,mass_dim,1>::type mass_density_type;
-
-/// derived dimension for linear momentum : L M T^-1
-typedef derived_dimension<length_dim,1,mass_dim,1,time_dim,-1>::type momentum_type;
-
-/// derived dimension for power : L^2 M T^-3
-typedef derived_dimension<length_dim,2,mass_dim,1,time_dim,-3>::type power_type;
-
-/// derived dimension for pressure : L^-1 M T^-2
-typedef derived_dimension<length_dim,-1,mass_dim,1,time_dim,-2>::type pressure_type;
-
-/// derived dimension for specific volume : L^3 M^-1
-typedef derived_dimension<length_dim,3,mass_dim,-1>::type specific_volume_type;
-
-/// derived dimension for stress : L^-1 M T^-2
-typedef derived_dimension<length_dim,-1,mass_dim,1,time_dim,-2>::type stress_type;
-
-/// derived dimension for surface density : L^-2 M
-typedef derived_dimension<length_dim,-2,mass_dim,1>::type surface_density_type;
-
-/// derived dimension for velocity : L T^-1
-typedef derived_dimension<length_dim,1,time_dim,-1>::type velocity_type;
-
-/// derived dimension for volume : l^3
-typedef derived_dimension<length_dim,3>::type volume_type;
-
-/// derived dimension for wavenumber : L^-1
-typedef derived_dimension<length_dim,-1>::type wavenumber_type;
-
-} // namespace units
-
-} // namespace boost
+#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>

#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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<absorbed_dose_type,SI::system> absorbed_dose;
+typedef unit<absorbed_dose_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<acceleration_type,SI::system> acceleration;
+typedef unit<acceleration_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<action_type,SI::system> action;
+typedef unit<action_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<activity_type,SI::system> activity;
+typedef unit<activity_dim,SI::system> activity;

BOOST_UNITS_STATIC_CONSTANT(becquerel,activity);
BOOST_UNITS_STATIC_CONSTANT(becquerels,activity);

Modified: sandbox/units/boost/units/systems/si/amount.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/amount.hpp (original)
+++ sandbox/units/boost/units/systems/si/amount.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<amount_type,SI::system> amount;
+typedef unit<amount_dimension,SI::system> amount;

BOOST_UNITS_STATIC_CONSTANT(mole,amount);
BOOST_UNITS_STATIC_CONSTANT(moles,amount);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<angular_velocity_type,SI::system> angular_velocity;
+typedef unit<angular_velocity_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<area_type,SI::system> area;
+typedef unit<area_dim,SI::system> area;

BOOST_UNITS_STATIC_CONSTANT(square_meter,area);
BOOST_UNITS_STATIC_CONSTANT(square_meters,area);

Modified: sandbox/units/boost/units/systems/si/capacitance.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/capacitance.hpp (original)
+++ sandbox/units/boost/units/systems/si/capacitance.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// capacitance : L^-2 M^-1 T^4 C^2
-typedef derived_dimension<length_dim,-2,mass_dim,-1,time_dim,4,current_dim,2>::type capacitance_type;
+typedef derived_dimension<length_base_dimension,-2,mass_base_dimension,-1,time_base_dimension,4,current_base_dimension,2>::type capacitance_type;

typedef unit<SI::capacitance_type,SI::system> capacitance;

Modified: sandbox/units/boost/units/systems/si/catalytic_activity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/catalytic_activity.hpp (original)
+++ sandbox/units/boost/units/systems/si/catalytic_activity.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,9 +20,9 @@
namespace SI {

/// catalytic activity : T^-1 A^1
-typedef derived_dimension<time_dim,-1,amount_dim,1>::type catalytic_activity_type;
+typedef derived_dimension<time_base_dimension,-1,amount_base_dimension,1>::type catalytic_activity_dim;

-typedef unit<SI::catalytic_activity_type,SI::system> catalytic_activity;
+typedef unit<SI::catalytic_activity_dim,SI::system> catalytic_activity;

BOOST_UNITS_STATIC_CONSTANT(katal,catalytic_activity);
BOOST_UNITS_STATIC_CONSTANT(katals,catalytic_activity);

Modified: sandbox/units/boost/units/systems/si/codata/atomic_and_nuclear_constants.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/codata/atomic_and_nuclear_constants.hpp (original)
+++ sandbox/units/boost/units/systems/si/codata/atomic_and_nuclear_constants.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -11,25 +11,15 @@
#ifndef BOOST_UNITS_CODATA_ATOMIC_AND_NUCLEAR_CONSTANTS_HPP
#define BOOST_UNITS_CODATA_ATOMIC_AND_NUCLEAR_CONSTANTS_HPP

-#include <boost/units/static_constant.hpp>
-
-#include <boost/units/systems/si/constants.hpp>
-#include <boost/units/systems/si/amount.hpp>
-#include <boost/units/systems/si/area.hpp>
-#include <boost/units/systems/si/electric_charge.hpp>
-#include <boost/units/systems/si/energy.hpp>
-#include <boost/units/systems/si/frequency.hpp>
-#include <boost/units/systems/si/length.hpp>
-#include <boost/units/systems/si/mass.hpp>
-#include <boost/units/systems/si/magnetic_flux_density.hpp>
-#include <boost/units/systems/si/time.hpp>
-#include <boost/units/systems/si/wavenumber.hpp>
-
-#include <boost/units/systems/si/codata/typedefs.hpp>
-
-/// \file
-/// CODATA recommended values of fundamental atomic and nuclear constants
-/// CODATA 2006 values as of 2007/03/30
+#include <boost/units/systems/si/codata/alpha_constants.hpp>
+#include <boost/units/systems/si/codata/deuteron_constants.hpp>
+#include <boost/units/systems/si/codata/electron_constants.hpp>
+#include <boost/units/systems/si/codata/helion_constants.hpp>
+#include <boost/units/systems/si/codata/muon_constants.hpp>
+#include <boost/units/systems/si/codata/neutron_constants.hpp>
+#include <boost/units/systems/si/codata/proton_constants.hpp>
+#include <boost/units/systems/si/codata/tau_constants.hpp>
+#include <boost/units/systems/si/codata/triton_constants.hpp>

namespace boost {

@@ -53,243 +43,6 @@
/// Hartree energy
BOOST_UNITS_PHYSICAL_CONSTANT(E_h,quantity<energy>,4.35974394e-18*joules,2.2e-25*joules);

-/// electron mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_e,quantity<mass>,9.10938215e-31*kilograms,4.5e-38*kilograms);
-/// electron-muon mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_e_over_m_mu,quantity<dimensionless>,4.83633171e-3*dimensionless(),1.2e-10*dimensionless());
-/// electron-tau mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_e_over_m_tau,quantity<dimensionless>,2.87564e-4*dimensionless(),4.7e-8*dimensionless());
-/// electron-proton mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_e_over_m_p,quantity<dimensionless>,5.4461702177e-4*dimensionless(),2.4e-13*dimensionless());
-/// electron-neutron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_e_over_m_n,quantity<dimensionless>,5.4386734459e-4*dimensionless(),3.3e-13*dimensionless());
-/// electron-deuteron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_e_over_m_d,quantity<dimensionless>,2.7244371093e-4*dimensionless(),1.2e-13*dimensionless());
-/// electron-alpha particle mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_e_over_m_alpha,quantity<dimensionless>,1.37093355570e-4*dimensionless(),5.8e-14*dimensionless());
-/// electron charge to mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(e_over_m_e,quantity<electric_charge_over_mass>,1.758820150e11*coulombs/kilogram,4.4e3*coulombs/kilogram);
-/// electron molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_e,quantity<mass_over_amount>,5.4857990943e-7*kilograms/mole,2.3e-16*kilograms/mole);
-/// Compton wavelength
-BOOST_UNITS_PHYSICAL_CONSTANT(lambda_C,quantity<length>,2.4263102175e-12*meters,3.3e-21*meters);
-/// classical electron radius
-BOOST_UNITS_PHYSICAL_CONSTANT(r_e,quantity<length>,2.8179402894e-15*meters,5.8e-24*meters);
-/// Thompson cross section
-BOOST_UNITS_PHYSICAL_CONSTANT(sigma_e,quantity<area>,0.6652458558e-28*square_meters,2.7e-37*square_meters);
-/// electron magnetic moment
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e,quantity<energy_over_magnetic_flux_density>,-928.476377e-26*joules/tesla,2.3e-31*joules/tesla);
-/// electron-Bohr magenton moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e_over_mu_B,quantity<dimensionless>,-1.00115965218111*dimensionless(),7.4e-13*dimensionless());
-/// electron-nuclear magneton moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e_over_mu_N,quantity<dimensionless>,-183.28197092*dimensionless(),8.0e-7*dimensionless());
-/// electron magnetic moment anomaly
-BOOST_UNITS_PHYSICAL_CONSTANT(a_e,quantity<dimensionless>,1.15965218111e-3*dimensionless(),7.4e-13*dimensionless());
-/// electron g-factor
-BOOST_UNITS_PHYSICAL_CONSTANT(g_e,quantity<dimensionless>,-2.0023193043622*dimensionless(),1.5e-12*dimensionless());
-/// electron-muon magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e_over_mu_mu,quantity<dimensionless>,206.7669877*dimensionless(),5.2e-6*dimensionless());
-/// electron-proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e_over_mu_p,quantity<dimensionless>,-658.2106848*dimensionless(),5.4e-6*dimensionless());
-/// electron-shielded proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e_over_mu_p_prime,quantity<dimensionless>,-658.2275971*dimensionless(),7.2e-6*dimensionless());
-/// electron-neutron magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e_over_mu_n,quantity<dimensionless>,960.92050*dimensionless(),2.3e-4*dimensionless());
-/// electron-deuteron magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e_over_mu_d,quantity<dimensionless>,-2143.923498*dimensionless(),1.8e-5*dimensionless());
-/// electron-shielded helion magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_e_over_mu_h_prime,quantity<dimensionless>,864.058257*dimensionless(),1.0e-5*dimensionless());
-/// electron gyromagnetic ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(gamma_e,quantity<frequency_over_magnetic_flux_density>,1.760859770e11/second/tesla,4.4e3/second/tesla);
-
-/// muon mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_mu,quantity<mass>,1.88353130e-28*kilograms,1.1e-35*kilograms);
-/// muon-electron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_mu_over_m_e,quantity<dimensionless>,206.7682823*dimensionless(),5.2e-6*dimensionless());
-/// muon-tau mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_mu_over_m_tau,quantity<dimensionless>,5.94592e-2*dimensionless(),9.7e-6*dimensionless());
-/// muon-proton mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_mu_over_m_p,quantity<dimensionless>,0.1126095261*dimensionless(),2.9e-9*dimensionless());
-/// muon-neutron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_mu_over_m_n,quantity<dimensionless>,0.1124545167*dimensionless(),2.9e-9*dimensionless());
-/// muon molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_mu,quantity<mass_over_amount>,0.1134289256e-3*kilograms/mole,2.9e-12*kilograms/mole);
-/// muon Compton wavelength
-BOOST_UNITS_PHYSICAL_CONSTANT(lambda_C_mu,quantity<length>,11.73444104e-15*meters,3.0e-22*meters);
-/// muon magnetic moment
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_mu,quantity<energy_over_magnetic_flux_density>,-4.49044786e-26*joules/tesla,1.6e-33*joules/tesla);
-/// muon-Bohr magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_mu_over_mu_B,quantity<dimensionless>,-4.84197049e-3*dimensionless(),1.2e-10*dimensionless());
-/// muon-nuclear magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_mu_over_mu_N,quantity<dimensionless>,-8.89059705*dimensionless(),2.3e-7*dimensionless());
-/// muon magnetic moment anomaly
-BOOST_UNITS_PHYSICAL_CONSTANT(a_mu,quantity<dimensionless>,1.16592069e-3*dimensionless(),6.0e-10*dimensionless());
-/// muon g-factor
-BOOST_UNITS_PHYSICAL_CONSTANT(g_mu,quantity<dimensionless>,-2.0023318414*dimensionless(),1.2e-9*dimensionless());
-/// muon-proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_mu_over_mu_p,quantity<dimensionless>,-3.183345137*dimensionless(),8.5e-8*dimensionless());
-
-/// tau mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_tau,quantity<mass>,3.16777e-27*kilograms,5.2e-31*kilograms);
-/// tau-electron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_tau_over_m_e,quantity<dimensionless>,3477.48*dimensionless(),5.7e-1*dimensionless());
-/// tau-muon mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_tau_over_m_mu,quantity<dimensionless>,16.8183*dimensionless(),2.7e-3*dimensionless());
-/// tau-proton mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_tau_over_m_p,quantity<dimensionless>,1.89390*dimensionless(),3.1e-4*dimensionless());
-/// tau-neutron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_tau_over_m_n,quantity<dimensionless>,1.89129*dimensionless(),3.1e-4*dimensionless());
-/// tau molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_tau,quantity<mass_over_amount>,1.90768e-3*kilograms/mole,3.1e-7*kilograms/mole);
-/// tau Compton wavelength
-BOOST_UNITS_PHYSICAL_CONSTANT(lambda_C_tau,quantity<length>,0.69772e-15*meters,1.1e-19*meters);
-
-/// proton mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_p,quantity<mass>,1.672621637e-27*kilograms,8.3e-35*kilograms);
-/// proton-electron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_p_over_m_e,quantity<dimensionless>,1836.15267247*dimensionless(),8.0e-7*dimensionless());
-/// proton-muon mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_p_over_m_mu,quantity<dimensionless>,8.88024339*dimensionless(),2.3e-7*dimensionless());
-/// proton-tau mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_p_over_m_tau,quantity<dimensionless>,0.528012*dimensionless(),8.6e-5*dimensionless());
-/// proton-neutron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_p_over_m_n,quantity<dimensionless>,0.99862347824*dimensionless(),4.6e-10*dimensionless());
-/// proton charge to mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(e_over_m_p,quantity<electric_charge_over_mass>,9.57883392e7*coulombs/kilogram,2.4e0*coulombs/kilogram);
-/// proton molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_p,quantity<mass_over_amount>,1.00727646677e-3*kilograms/mole,1.0e-13*kilograms/mole);
-/// proton Compton wavelength
-BOOST_UNITS_PHYSICAL_CONSTANT(lambda_C_p,quantity<length>,1.3214098446e-15*meters,1.9e-24*meters);
-/// proton rms charge radius
-BOOST_UNITS_PHYSICAL_CONSTANT(R_p,quantity<length>,0.8768e-15*meters,6.9e-18*meters);
-/// proton magnetic moment
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_p,quantity<energy_over_magnetic_flux_density>,1.410606662e-26*joules/tesla,3.7e-34*joules/tesla);
-/// proton-Bohr magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_p_over_mu_B,quantity<dimensionless>,1.521032209e-3*dimensionless(),1.2e-11*dimensionless());
-/// proton-nuclear magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_p_over_mu_N,quantity<dimensionless>,2.792847356*dimensionless(),2.3e-8*dimensionless());
-/// proton g-factor
-BOOST_UNITS_PHYSICAL_CONSTANT(g_p,quantity<dimensionless>,5.585694713*dimensionless(),4.6e-8*dimensionless());
-/// proton-neutron magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_p_over_mu_n,quantity<dimensionless>,-1.45989806*dimensionless(),3.4e-7*dimensionless());
-/// shielded proton magnetic moment
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_p_prime,quantity<energy_over_magnetic_flux_density>,1.410570419e-26*joules/tesla,3.8e-34*joules/tesla);
-/// shielded proton-Bohr magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_p_prime_over_mu_B,quantity<dimensionless>,1.520993128e-3*dimensionless(),1.7e-11*dimensionless());
-/// shielded proton-nuclear magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_p_prime_over_mu_N,quantity<dimensionless>,2.792775598*dimensionless(),3.0e-8*dimensionless());
-/// proton magnetic shielding correction
-BOOST_UNITS_PHYSICAL_CONSTANT(sigma_p_prime,quantity<dimensionless>,25.694e-6*dimensionless(),1.4e-8*dimensionless());
-/// proton gyromagnetic ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(gamma_p,quantity<frequency_over_magnetic_flux_density>,2.675222099e8/second/tesla,7.0e0/second/tesla);
-/// shielded proton gyromagnetic ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(gamma_p_prime,quantity<frequency_over_magnetic_flux_density>,2.675153362e8/second/tesla,7.3e0/second/tesla);
-
-/// neutron mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_n,quantity<mass>,1.674927211e-27*kilograms,8.4e-35*kilograms);
-/// neutron-electron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_n_over_m_e,quantity<dimensionless>,1838.6836605*dimensionless(),1.1e-6*dimensionless());
-/// neutron-muon mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_n_over_m_mu,quantity<dimensionless>,8.89248409*dimensionless(),2.3e-7*dimensionless());
-/// neutron-tau mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_n_over_m_tau,quantity<dimensionless>,0.528740*dimensionless(),8.6e-5*dimensionless());
-/// neutron-proton mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_n_over_m_p,quantity<dimensionless>,1.00137841918*dimensionless(),4.6e-10*dimensionless());
-/// neutron molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_n,quantity<mass_over_amount>,1.00866491597e-3*kilograms/mole,4.3e-13*kilograms/mole);
-/// neutron Compton wavelength
-BOOST_UNITS_PHYSICAL_CONSTANT(lambda_C_n,quantity<length>,1.3195908951e-15*meters,2.0e-24*meters);
-/// neutron magnetic moment
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_n,quantity<energy_over_magnetic_flux_density>,-0.96623641e-26*joules/tesla,2.3e-33*joules/tesla);
-/// neutron g-factor
-BOOST_UNITS_PHYSICAL_CONSTANT(g_n,quantity<dimensionless>,-3.82608545*dimensionless(),9.0e-7*dimensionless());
-/// neutron-electron magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_n_over_mu_e,quantity<dimensionless>,1.04066882e-3*dimensionless(),2.5e-10*dimensionless());
-/// neutron-proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_n_over_mu_p,quantity<dimensionless>,-0.68497934*dimensionless(),1.6e-7*dimensionless());
-/// neutron-shielded proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_n_over_mu_p_prime,quantity<dimensionless>,-0.68499694*dimensionless(),1.6e-7*dimensionless());
-/// neutron gyromagnetic ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(gamma_n,quantity<frequency_over_magnetic_flux_density>,1.83247185e8/second/tesla,4.3e1/second/tesla);
-
-/// deuteron mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_d,quantity<mass>,3.34358320e-27*kilograms,1.7e-34*kilograms);
-/// deuteron-electron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_d_over_m_e,quantity<dimensionless>,3670.4829654*dimensionless(),1.6e-6*dimensionless());
-/// deuteron-proton mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_d_over_m_p,quantity<dimensionless>,1.99900750108*dimensionless(),2.2e-10*dimensionless());
-/// deuteron molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_d,quantity<mass_over_amount>,2.013553212724e-3*kilograms/mole,7.8e-14*kilograms/mole);
-/// deuteron rms charge radius
-BOOST_UNITS_PHYSICAL_CONSTANT(R_d,quantity<length>,2.1402e-15*meters,2.8e-18*meters);
-/// deuteron magnetic moment
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_d,quantity<energy_over_magnetic_flux_density>,0.433073465e-26*joules/tesla,1.1e-34*joules/tesla);
-/// deuteron-Bohr magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_d_over_mu_B,quantity<dimensionless>,0.4669754556e-3*dimensionless(),3.9e-12*dimensionless());
-/// deuteron-nuclear magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_d_over_mu_N,quantity<dimensionless>,0.8574382308*dimensionless(),7.2e-9*dimensionless());
-/// deuteron g-factor
-BOOST_UNITS_PHYSICAL_CONSTANT(g_d,quantity<dimensionless>,0.8574382308*dimensionless(),7.2e-9*dimensionless());
-/// deuteron-electron magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_d_over_mu_e,quantity<dimensionless>,-4.664345537e-4*dimensionless(),3.9e-12*dimensionless());
-/// deuteron-proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_d_over_mu_p,quantity<dimensionless>,0.3070122070*dimensionless(),2.4e-9*dimensionless());
-/// deuteron-neutron magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_d_over_mu_n,quantity<dimensionless>,-0.44820652*dimensionless(),1.1e-7*dimensionless());
-
-/// triton mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_t,quantity<mass>,5.00735588e-27*kilograms,2.5e-34*kilograms);
-/// triton-electron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_t_over_m_e,quantity<dimensionless>,5496.9215269*dimensionless(),5.1e-6*dimensionless());
-/// triton-proton mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_t_over_m_p,quantity<dimensionless>,2.9937170309*dimensionless(),2.5e-9*dimensionless());
-/// triton molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_t,quantity<mass_over_amount>,3.0155007134e-3*kilograms/mole,2.5e-12*kilograms/mole);
-/// triton magnetic moment
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_t,quantity<energy_over_magnetic_flux_density>,1.504609361e-26*joules/tesla,4.2e-34*joules/tesla);
-/// triton-Bohr magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_t_over_mu_B,quantity<dimensionless>,1.622393657e-3*dimensionless(),2.1e-11*dimensionless());
-/// triton-nuclear magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_t_over_mu_N,quantity<dimensionless>,2.978962448*dimensionless(),3.8e-8*dimensionless());
-/// triton g-factor
-BOOST_UNITS_PHYSICAL_CONSTANT(g_t,quantity<dimensionless>,5.957924896*dimensionless(),7.6e-8*dimensionless());
-/// triton-electron magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_t_over_mu_e,quantity<dimensionless>,-1.620514423e-3*dimensionless(),2.1e-11*dimensionless());
-/// triton-proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_t_over_mu_p,quantity<dimensionless>,1.066639908*dimensionless(),1.0e-8*dimensionless());
-/// triton-neutron magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_t_over_mu_n,quantity<dimensionless>,-1.55718553*dimensionless(),3.7e-7*dimensionless());
-
-/// helion mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_h,quantity<mass>,5.00641192e-27*kilograms,2.5e-34*kilograms);
-/// helion-electron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_h_over_m_e,quantity<dimensionless>,5495.8852765*dimensionless(),5.2e-6*dimensionless());
-/// helion-proton mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_h_over_m_p,quantity<dimensionless>,2.9931526713*dimensionless(),2.6e-9*dimensionless());
-/// helion molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_h,quantity<mass_over_amount>,3.0149322473e-3*kilograms/mole,2.6e-12*kilograms/mole);
-/// helion shielded magnetic moment
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_h_prime,quantity<energy_over_magnetic_flux_density>,-1.074552982e-26*joules/tesla,3.0e-34*joules/tesla);
-/// shielded helion-Bohr magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_h_prime_over_mu_B,quantity<dimensionless>,-1.158671471e-3*dimensionless(),1.4e-11*dimensionless());
-/// shielded helion-nuclear magneton ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_h_prime_over_mu_N,quantity<dimensionless>,-2.127497718*dimensionless(),2.5e-8*dimensionless());
-/// shielded helion-proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_h_prime_over_mu_p,quantity<dimensionless>,-0.761766558*dimensionless(),1.1e-8*dimensionless());
-/// shielded helion-shielded proton magnetic moment ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(mu_h_prime_over_mu_p_prime,quantity<dimensionless>,-0.7617861313*dimensionless(),3.3e-8*dimensionless());
-/// shielded helion gyromagnetic ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(gamma_h_prime,quantity<frequency_over_magnetic_flux_density>,2.037894730e8/second/tesla,5.6e-0/second/tesla);
-
-/// alpha particle mass
-BOOST_UNITS_PHYSICAL_CONSTANT(m_alpha,quantity<mass>,6.64465620e-27*kilograms,3.3e-34*kilograms);
-/// alpha-electron mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_alpha_over_m_e,quantity<dimensionless>,7294.2995365*dimensionless(),3.1e-6*dimensionless());
-/// alpha-proton mass ratio
-BOOST_UNITS_PHYSICAL_CONSTANT(m_alpha_over_m_p,quantity<dimensionless>,3.97259968951*dimensionless(),4.1e-10*dimensionless());
-/// alpha molar mass
-BOOST_UNITS_PHYSICAL_CONSTANT(M_alpha,quantity<mass_over_amount>,4.001506179127e-3*kilograms/mole,6.2e-14*kilograms/mole);
-
} // namespace CODATA

} // namespace constants

Modified: sandbox/units/boost/units/systems/si/codata/electromagnetic_constants.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/codata/electromagnetic_constants.hpp (original)
+++ sandbox/units/boost/units/systems/si/codata/electromagnetic_constants.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -13,7 +13,7 @@

#include <boost/units/static_constant.hpp>

-#include <boost/units/systems/si/constants.hpp>
+#include <boost/units/systems/constants.hpp>
#include <boost/units/systems/si/conductance.hpp>
#include <boost/units/systems/si/current.hpp>
#include <boost/units/systems/si/electric_charge.hpp>

Modified: sandbox/units/boost/units/systems/si/codata/physico-chemical_constants.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/codata/physico-chemical_constants.hpp (original)
+++ sandbox/units/boost/units/systems/si/codata/physico-chemical_constants.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -13,7 +13,7 @@

#include <boost/units/static_constant.hpp>

-#include <boost/units/systems/si/constants.hpp>
+#include <boost/units/systems/constants.hpp>
#include <boost/units/systems/si/amount.hpp>
#include <boost/units/systems/si/area.hpp>
#include <boost/units/systems/si/electric_charge.hpp>

Modified: sandbox/units/boost/units/systems/si/codata/typedefs.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/codata/typedefs.hpp (original)
+++ sandbox/units/boost/units/systems/si/codata/typedefs.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -50,7 +50,7 @@
typedef divide_typeof_helper<energy_over_temperature,amount>::type energy_over_temperature_amount;
typedef divide_typeof_helper<
divide_typeof_helper<power,area>::type,
- power_typeof_helper<temperature,static_rational<4> >::type
+ power_dimof_helper<temperature,static_rational<4> >::type
>::type power_over_area_temperature_4;
typedef multiply_typeof_helper<power,area>::type power_area;
typedef divide_typeof_helper<power_area,solid_angle>::type power_area_over_solid_angle;

Modified: sandbox/units/boost/units/systems/si/codata/universal_constants.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/codata/universal_constants.hpp (original)
+++ sandbox/units/boost/units/systems/si/codata/universal_constants.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -13,7 +13,7 @@

#include <boost/units/static_constant.hpp>

-#include <boost/units/systems/si/constants.hpp>
+#include <boost/units/systems/constants.hpp>
#include <boost/units/systems/si/capacitance.hpp>
#include <boost/units/systems/si/current.hpp>
#include <boost/units/systems/si/energy.hpp>

Modified: sandbox/units/boost/units/systems/si/codata_constants.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/codata_constants.hpp (original)
+++ sandbox/units/boost/units/systems/si/codata_constants.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -11,32 +11,6 @@
#ifndef BOOST_UNITS_CODATA_CONSTANTS_HPP
#define BOOST_UNITS_CODATA_CONSTANTS_HPP

-#include <boost/units/systems/si/base.hpp>
-
-/// \file includes all the files boost/units/systems/si/codata/*.hpp
-
-namespace boost {
-
-namespace units {
-
-namespace SI {
-
-namespace constants {
-
-namespace CODATA {
-
-//typedef dimensionless_quantity<SI::system,double>::type dimensionless_constant;
-
-} // namespace CODATA
-
-} // namespace constants
-
-} // namespace SI
-
-} // namespace units
-
-} // namespace boost
-
#include <boost/units/systems/si/codata/atomic_and_nuclear_constants.hpp>
#include <boost/units/systems/si/codata/electromagnetic_constants.hpp>
#include <boost/units/systems/si/codata/physico-chemical_constants.hpp>

Modified: sandbox/units/boost/units/systems/si/conductance.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/conductance.hpp (original)
+++ sandbox/units/boost/units/systems/si/conductance.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// conductance : L^-2 M^-1 T^3 C^2
-typedef derived_dimension<length_dim,-2,mass_dim,-1,time_dim,3,current_dim,2>::type conductance_type;
+typedef derived_dimension<length_base_dimension,-2,mass_base_dimension,-1,time_base_dimension,3,current_base_dimension,2>::type conductance_type;

typedef unit<SI::conductance_type,SI::system> conductance;

Modified: sandbox/units/boost/units/systems/si/conductivity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/conductivity.hpp (original)
+++ sandbox/units/boost/units/systems/si/conductivity.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// conductivity : L^-3 M^-1 T^3 C^2
-typedef derived_dimension<length_dim,-3,mass_dim,-1,time_dim,3,current_dim,2>::type conductivity_type;
+typedef derived_dimension<length_base_dimension,-3,mass_base_dimension,-1,time_base_dimension,3,current_base_dimension,2>::type conductivity_type;

typedef unit<SI::conductivity_type,SI::system> conductivity;

Modified: sandbox/units/boost/units/systems/si/current.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/current.hpp (original)
+++ sandbox/units/boost/units/systems/si/current.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<current_type,SI::system> current;
+typedef unit<current_dimension,SI::system> current;

BOOST_UNITS_STATIC_CONSTANT(ampere,current);
BOOST_UNITS_STATIC_CONSTANT(amperes,current);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<dose_equivalent_type,SI::system> dose_equivalent;
+typedef unit<dose_equivalent_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<dynamic_viscosity_type,SI::system> dynamic_viscosity;
+typedef unit<dynamic_viscosity_dim,SI::system> dynamic_viscosity;

} // namespace SI

Modified: sandbox/units/boost/units/systems/si/electric_charge.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/electric_charge.hpp (original)
+++ sandbox/units/boost/units/systems/si/electric_charge.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// electric charge : T^1 C^1
-typedef derived_dimension<time_dim,1,current_dim,1>::type electric_charge_type;
+typedef derived_dimension<time_base_dimension,1,current_base_dimension,1>::type electric_charge_type;

typedef unit<SI::electric_charge_type,SI::system> electric_charge;

Modified: sandbox/units/boost/units/systems/si/electric_potential.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/electric_potential.hpp (original)
+++ sandbox/units/boost/units/systems/si/electric_potential.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// electric potential : L^2 M T^-3 C^-1
-typedef derived_dimension<length_dim,2,mass_dim,1,time_dim,-3,current_dim,-1>::type electric_potential_type;
+typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-3,current_base_dimension,-1>::type electric_potential_type;

typedef unit<SI::electric_potential_type,SI::system> electric_potential;

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<energy_type,SI::system> energy;
+typedef unit<energy_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<force_type,SI::system> force;
+typedef unit<force_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<frequency_type,SI::system> frequency;
+typedef unit<frequency_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<illuminance_type,SI::system> illuminance;
+typedef unit<illuminance_dim,SI::system> illuminance;

BOOST_UNITS_STATIC_CONSTANT(lux,illuminance);

Modified: sandbox/units/boost/units/systems/si/impedance.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/impedance.hpp (original)
+++ sandbox/units/boost/units/systems/si/impedance.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// impedance : L^2 M T^-3 C^-2
-typedef derived_dimension<length_dim,2,mass_dim,1,time_dim,-3,current_dim,-2>::type impedance_type;
+typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-3,current_base_dimension,-2>::type impedance_type;

typedef unit<SI::impedance_type,SI::system> impedance;

Modified: sandbox/units/boost/units/systems/si/inductance.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/inductance.hpp (original)
+++ sandbox/units/boost/units/systems/si/inductance.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// inductance : L^2 M T^-2 C^-2
-typedef derived_dimension<length_dim,2,mass_dim,1,time_dim,-2,current_dim,-2>::type inductance_type;
+typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-2,current_base_dimension,-2>::type inductance_type;

typedef unit<SI::inductance_type,SI::system> inductance;

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<kinematic_viscosity_type,SI::system> kinematic_viscosity;
+typedef unit<kinematic_viscosity_dim,SI::system> kinematic_viscosity;

} // namespace SI

Modified: sandbox/units/boost/units/systems/si/length.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/length.hpp (original)
+++ sandbox/units/boost/units/systems/si/length.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<length_type,SI::system> length;
+typedef unit<length_dimension,SI::system> length;

BOOST_UNITS_STATIC_CONSTANT(meter,length);
BOOST_UNITS_STATIC_CONSTANT(meters,length);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<luminous_flux_type,SI::system> luminous_flux;
+typedef unit<luminous_flux_dim,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/luminous_intensity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/luminous_intensity.hpp (original)
+++ sandbox/units/boost/units/systems/si/luminous_intensity.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<luminous_intensity_type,SI::system> luminous_intensity;
+typedef unit<luminous_intensity_dimension,SI::system> luminous_intensity;

BOOST_UNITS_STATIC_CONSTANT(candela,luminous_intensity);
BOOST_UNITS_STATIC_CONSTANT(candelas,luminous_intensity);

Modified: sandbox/units/boost/units/systems/si/magnetic_field_intensity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/magnetic_field_intensity.hpp (original)
+++ sandbox/units/boost/units/systems/si/magnetic_field_intensity.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// magnetic field intensity : L^-1 C
-typedef derived_dimension<length_dim,-1,current_dim,1>::type magnetic_field_intensity_type;
+typedef derived_dimension<length_base_dimension,-1,current_base_dimension,1>::type magnetic_field_intensity_type;

typedef unit<SI::magnetic_field_intensity_type,SI::system> magnetic_field_intensity;

Modified: sandbox/units/boost/units/systems/si/magnetic_flux.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/magnetic_flux.hpp (original)
+++ sandbox/units/boost/units/systems/si/magnetic_flux.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// magnetic flux : L^2 M T^-2 C^-1
-typedef derived_dimension<length_dim,2,mass_dim,1,time_dim,-2,current_dim,-1>::type magnetic_flux_type;
+typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-2,current_base_dimension,-1>::type magnetic_flux_type;

typedef unit<SI::magnetic_flux_type,SI::system> magnetic_flux;

Modified: sandbox/units/boost/units/systems/si/magnetic_flux_density.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/magnetic_flux_density.hpp (original)
+++ sandbox/units/boost/units/systems/si/magnetic_flux_density.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// magnetic flux density : M T^-2 C^-1
-typedef derived_dimension<mass_dim,1,time_dim,-2,current_dim,-1>::type magnetic_flux_density_type;
+typedef derived_dimension<mass_base_dimension,1,time_base_dimension,-2,current_base_dimension,-1>::type magnetic_flux_density_type;

typedef unit<SI::magnetic_flux_density_type,SI::system> magnetic_flux_density;

Modified: sandbox/units/boost/units/systems/si/mass.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/mass.hpp (original)
+++ sandbox/units/boost/units/systems/si/mass.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<mass_type,SI::system> mass;
+typedef unit<mass_dimension,SI::system> mass;

BOOST_UNITS_STATIC_CONSTANT(kilogram,mass);
BOOST_UNITS_STATIC_CONSTANT(kilograms,mass);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<mass_density_type,SI::system> mass_density;
+typedef unit<mass_density_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<momentum_type,SI::system> momentum;
+typedef unit<momentum_dim,SI::system> momentum;

} // namespace SI

Modified: sandbox/units/boost/units/systems/si/permeability.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/permeability.hpp (original)
+++ sandbox/units/boost/units/systems/si/permeability.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// permeability : L M T^-2 C^-2
-typedef derived_dimension<length_dim,1,mass_dim,1,time_dim,-2,current_dim,-2>::type permeability_type;
+typedef derived_dimension<length_base_dimension,1,mass_base_dimension,1,time_base_dimension,-2,current_base_dimension,-2>::type permeability_type;

typedef unit<SI::permeability_type,SI::system> permeability;

Modified: sandbox/units/boost/units/systems/si/permittivity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/permittivity.hpp (original)
+++ sandbox/units/boost/units/systems/si/permittivity.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// permittivity : L^-3 M^-1 T^4 C^2
-typedef derived_dimension<length_dim,-3,mass_dim,-1,time_dim,4,current_dim,2>::type permittivity_type;
+typedef derived_dimension<length_base_dimension,-3,mass_base_dimension,-1,time_base_dimension,4,current_base_dimension,2>::type permittivity_type;

typedef unit<SI::permittivity_type,SI::system> permittivity;

Modified: sandbox/units/boost/units/systems/si/plane_angle.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/plane_angle.hpp (original)
+++ sandbox/units/boost/units/systems/si/plane_angle.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<plane_angle_type,SI::system> plane_angle;
+typedef unit<plane_angle_dimension,SI::system> plane_angle;

BOOST_UNITS_STATIC_CONSTANT(radian,plane_angle);
BOOST_UNITS_STATIC_CONSTANT(radians,plane_angle);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<power_type,SI::system> power;
+typedef unit<power_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<pressure_type,SI::system> pressure;
+typedef unit<pressure_dim,SI::system> pressure;

// windef.h #defines pascal on Metrowerks compilers
#if defined(__MWERKS__)

Modified: sandbox/units/boost/units/systems/si/reluctance.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/reluctance.hpp (original)
+++ sandbox/units/boost/units/systems/si/reluctance.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// reluctance : L^-2 M^-1 T^2 C^2
-typedef derived_dimension<length_dim,-2,mass_dim,-1,time_dim,2,current_dim,2>::type reluctance_type;
+typedef derived_dimension<length_base_dimension,-2,mass_base_dimension,-1,time_base_dimension,2,current_base_dimension,2>::type reluctance_type;

typedef unit<SI::reluctance_type,SI::system> reluctance;

Modified: sandbox/units/boost/units/systems/si/resistance.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/resistance.hpp (original)
+++ sandbox/units/boost/units/systems/si/resistance.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// resistance : L^2 M T^-3 C^-2
-typedef derived_dimension<length_dim,2,mass_dim,1,time_dim,-3,current_dim,-2>::type resistance_type;
+typedef derived_dimension<length_base_dimension,2,mass_base_dimension,1,time_base_dimension,-3,current_base_dimension,-2>::type resistance_type;

typedef unit<SI::resistance_type,SI::system> resistance;

Modified: sandbox/units/boost/units/systems/si/resistivity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/resistivity.hpp (original)
+++ sandbox/units/boost/units/systems/si/resistivity.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -20,7 +20,7 @@
namespace SI {

/// resistivity : L^3 M T^-3 C^-2
-typedef derived_dimension<length_dim,3,mass_dim,1,time_dim,-3,current_dim,-2>::type resistivity_type;
+typedef derived_dimension<length_base_dimension,3,mass_base_dimension,1,time_base_dimension,-3,current_base_dimension,-2>::type resistivity_type;

typedef unit<SI::resistivity_type,SI::system> resistivity;

Modified: sandbox/units/boost/units/systems/si/solid_angle.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/solid_angle.hpp (original)
+++ sandbox/units/boost/units/systems/si/solid_angle.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<solid_angle_type,SI::system> solid_angle;
+typedef unit<solid_angle_dimension,SI::system> solid_angle;

BOOST_UNITS_STATIC_CONSTANT(steradian,solid_angle);
BOOST_UNITS_STATIC_CONSTANT(steradians,solid_angle);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<surface_density_type,SI::system> surface_density;
+typedef unit<surface_density_dim,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/temperature.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/temperature.hpp (original)
+++ sandbox/units/boost/units/systems/si/temperature.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<temperature_type,SI::system> temperature;
+typedef unit<temperature_dimension,SI::system> temperature;

BOOST_UNITS_STATIC_CONSTANT(kelvin,temperature);
BOOST_UNITS_STATIC_CONSTANT(kelvins,temperature);

Modified: sandbox/units/boost/units/systems/si/time.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/time.hpp (original)
+++ sandbox/units/boost/units/systems/si/time.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<time_type,SI::system> time;
+typedef unit<time_dimension,SI::system> time;

BOOST_UNITS_STATIC_CONSTANT(second,time);
BOOST_UNITS_STATIC_CONSTANT(seconds,time);

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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<velocity_type,SI::system> velocity;
+typedef unit<velocity_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<volume_type,SI::system> volume;
+typedef unit<volume_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -19,7 +19,7 @@

namespace SI {

-typedef unit<wavenumber_type,SI::system> wavenumber;
+typedef unit<wavenumber_dim,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -27,7 +27,7 @@

typedef make_system<celsius_tag>::type system;

-typedef unit<temperature_type,system> temperature;
+typedef unit<temperature_dimension,system> temperature;

BOOST_UNITS_STATIC_CONSTANT(degree,temperature);
BOOST_UNITS_STATIC_CONSTANT(degrees,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 12:44:24 EDT (Thu, 31 May 2007)
@@ -27,7 +27,7 @@

typedef make_system<fahrenheit_tag>::type system;

-typedef unit<temperature_type,system> temperature;
+typedef unit<temperature_dimension,system> temperature;

BOOST_UNITS_STATIC_CONSTANT(degree,temperature);
BOOST_UNITS_STATIC_CONSTANT(degrees,temperature);

Modified: sandbox/units/boost/units/systems/trig.hpp
==============================================================================
--- sandbox/units/boost/units/systems/trig.hpp (original)
+++ sandbox/units/boost/units/systems/trig.hpp 2007-05-31 12:44:24 EDT (Thu, 31 May 2007)
@@ -47,7 +47,7 @@
/// cos of theta in other angular units
template<class System,class Y>
typename dimensionless_quantity<System,Y>::type
-cos(const quantity<unit<plane_angle_type,System>,Y>& theta)
+cos(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
{
     return cos(quantity<SI::plane_angle,Y>(theta));
}
@@ -55,7 +55,7 @@
/// sin of theta in other angular units
template<class System,class Y>
typename dimensionless_quantity<System,Y>::type
-sin(const quantity<unit<plane_angle_type,System>,Y>& theta)
+sin(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
{
     return sin(quantity<SI::plane_angle,Y>(theta));
}
@@ -63,7 +63,7 @@
/// tan of theta in other angular units
template<class System,class Y>
typename dimensionless_quantity<System,Y>::type
-tan(const quantity<unit<plane_angle_type,System>,Y>& theta)
+tan(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
{
     return tan(quantity<SI::plane_angle,Y>(theta));
}
@@ -78,10 +78,10 @@

/// acos of dimensionless quantity returning angle in same system
template<class Y,class System>
-quantity<unit<plane_angle_type,System>,Y>
+quantity<unit<plane_angle_dimension,System>,Y>
acos(const quantity<unit<dimensionless_type,System>,Y>& val)
{
- return quantity<unit<plane_angle_type,System>,Y>(std::acos(val)*SI::radians);
+ return quantity<unit<plane_angle_dimension,System>,Y>(std::acos(val)*SI::radians);
}

/// asin of @c value_type returning angle in radians
@@ -94,10 +94,10 @@

/// asin of dimensionless quantity returning angle in same system
template<class Y,class System>
-quantity<unit<plane_angle_type,System>,Y>
+quantity<unit<plane_angle_dimension,System>,Y>
asin(const quantity<unit<dimensionless_type,System>,Y>& val)
{
- return quantity<unit<plane_angle_type,System>,Y>(std::asin(val)*SI::radians);
+ return quantity<unit<plane_angle_dimension,System>,Y>(std::asin(val)*SI::radians);
}

/// atan of @c value_type returning angle in radians
@@ -110,10 +110,10 @@

/// atan of dimensionless quantity returning angle in same system
template<class Y,class System>
-quantity<unit<plane_angle_type,System>,Y>
+quantity<unit<plane_angle_dimension,System>,Y>
atan(const quantity<unit<dimensionless_type,System>,Y>& val)
{
- return quantity<unit<plane_angle_type,System>,Y>(std::atan(val)*SI::radians);
+ return quantity<unit<plane_angle_dimension,System>,Y>(std::atan(val)*SI::radians);
}

/// atan2 of @c value_type returning angle in radians

Next message: matthiasschabel_at_[hidden]: "[Boost-commit] svn:boost r4380"
Previous message: matthiasschabel_at_[hidden]: "[Boost-commit] svn:boost r4378"

Date view	Thread view	Subject view	Author view

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