From: steven_at_[hidden]
Date: 2007-08-20 16:58:18
Author: steven_watanabe
Date: 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
New Revision: 38806
URL: http://svn.boost.org/trac/boost/changeset/38806
Log:
Changed type to dimension_type in base_dimension
Text files modified:
sandbox/units/boost/units/base_dimension.hpp | 3 ++-
sandbox/units/boost/units/detail/linear_algebra.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/amount.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/current.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/length.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/luminous_intensity.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/mass.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/plane_angle.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/solid_angle.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/temperature.hpp | 2 +-
sandbox/units/boost/units/systems/physical_dimensions/time.hpp | 2 +-
sandbox/units/libs/units/example/runtime_conversion_factor.cpp | 2 +-
sandbox/units/libs/units/example/test_system.hpp | 6 +++---
sandbox/units/libs/units/test/test_header.hpp | 6 +++---
sandbox/units/libs/units/test/test_predicates.cpp | 2 +-
15 files changed, 20 insertions(+), 19 deletions(-)
Modified: sandbox/units/boost/units/base_dimension.hpp
==============================================================================
--- sandbox/units/boost/units/base_dimension.hpp (original)
+++ sandbox/units/boost/units/base_dimension.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -60,7 +60,8 @@
{
public:
typedef base_dimension this_type;
- typedef dimension_list<dim<Derived,static_rational<1> >, dimensionless_type> type;
+ typedef dimension_list<dim<Derived,static_rational<1> >, dimensionless_type> dimension_type;
+ typedef Derived type;
private:
/// Register this ordinal
Modified: sandbox/units/boost/units/detail/linear_algebra.hpp
==============================================================================
--- sandbox/units/boost/units/detail/linear_algebra.hpp (original)
+++ sandbox/units/boost/units/detail/linear_algebra.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -1059,7 +1059,7 @@
template<class T>
struct is_simple_system {
typedef typename mpl::begin<T>::type Begin;
- typedef is_base_dimension_unit<typename mpl::deref<Begin>::type> test;
+ typedef is_base_dimension_unit<typename mpl::deref<Begin>::type::dimension_type> test;
typedef typename mpl::and_<
typename test::type,
typename is_simple_system_impl<
Modified: sandbox/units/boost/units/systems/physical_dimensions/amount.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/amount.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/amount.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// dimension of amount of substance (N)
-typedef amount_base_dimension::type amount_dimension;
+typedef amount_base_dimension::dimension_type amount_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_dimensions/current.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/current.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/current.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// dimension of electric current (I)
-typedef current_base_dimension::type current_dimension;
+typedef current_base_dimension::dimension_type current_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_dimensions/length.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/length.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/length.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// dimension of length (L)
-typedef length_base_dimension::type length_dimension;
+typedef length_base_dimension::dimension_type length_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_dimensions/luminous_intensity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/luminous_intensity.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/luminous_intensity.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// dimension of luminous intensity (J)
-typedef luminous_intensity_base_dimension::type luminous_intensity_dimension;
+typedef luminous_intensity_base_dimension::dimension_type luminous_intensity_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_dimensions/mass.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/mass.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/mass.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// dimension of mass (M)
-typedef mass_base_dimension::type mass_dimension;
+typedef mass_base_dimension::dimension_type mass_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_dimensions/plane_angle.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/plane_angle.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/plane_angle.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// base dimension of plane angle (QP)
-typedef plane_angle_base_dimension::type plane_angle_dimension;
+typedef plane_angle_base_dimension::dimension_type plane_angle_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_dimensions/solid_angle.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/solid_angle.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/solid_angle.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// base dimension of solid angle (QS)
-typedef solid_angle_base_dimension::type solid_angle_dimension;
+typedef solid_angle_base_dimension::dimension_type solid_angle_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_dimensions/temperature.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/temperature.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/temperature.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// dimension of temperature (Theta)
-typedef temperature_base_dimension::type temperature_dimension;
+typedef temperature_base_dimension::dimension_type temperature_dimension;
} // namespace units
Modified: sandbox/units/boost/units/systems/physical_dimensions/time.hpp
==============================================================================
--- sandbox/units/boost/units/systems/physical_dimensions/time.hpp (original)
+++ sandbox/units/boost/units/systems/physical_dimensions/time.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -38,7 +38,7 @@
namespace units {
/// dimension of time (T)
-typedef time_base_dimension::type time_dimension;
+typedef time_base_dimension::dimension_type time_dimension;
} // namespace units
Modified: sandbox/units/libs/units/example/runtime_conversion_factor.cpp
==============================================================================
--- sandbox/units/libs/units/example/runtime_conversion_factor.cpp (original)
+++ sandbox/units/libs/units/example/runtime_conversion_factor.cpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -19,7 +19,7 @@
struct currency_base_dimension : boost::units::base_dimension<currency_base_dimension, 1> {};
-typedef currency_base_dimension::type currency_type;
+typedef currency_base_dimension::dimension_type currency_type;
template<long N>
struct currency_base_unit : boost::units::base_unit<currency_base_unit<N>, currency_type, currency_base + N> {};
Modified: sandbox/units/libs/units/example/test_system.hpp
==============================================================================
--- sandbox/units/libs/units/example/test_system.hpp (original)
+++ sandbox/units/libs/units/example/test_system.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -42,9 +42,9 @@
#endif
//[test_system_snippet_3
-typedef length_base_dimension::type length_dimension;
-typedef mass_base_dimension::type mass_dimension;
-typedef time_base_dimension::type time_dimension;
+typedef length_base_dimension::dimension_type length_dimension;
+typedef mass_base_dimension::dimension_type mass_dimension;
+typedef time_base_dimension::dimension_type time_dimension;
//]
#if 0
Modified: sandbox/units/libs/units/test/test_header.hpp
==============================================================================
--- sandbox/units/libs/units/test/test_header.hpp (original)
+++ sandbox/units/libs/units/test/test_header.hpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -44,9 +44,9 @@
struct mass_base_dimension : boost::units::base_dimension<mass_base_dimension,2> { }; ///> base dimension of mass
struct time_base_dimension : boost::units::base_dimension<time_base_dimension,3> { }; ///> base dimension of time
-typedef length_base_dimension::type length_dimension;
-typedef mass_base_dimension::type mass_dimension;
-typedef time_base_dimension::type time_dimension;
+typedef length_base_dimension::dimension_type length_dimension;
+typedef mass_base_dimension::dimension_type mass_dimension;
+typedef time_base_dimension::dimension_type time_dimension;
typedef derived_dimension<length_base_dimension,2>::type area_dimension;
typedef derived_dimension<mass_base_dimension,1,
Modified: sandbox/units/libs/units/test/test_predicates.cpp
==============================================================================
--- sandbox/units/libs/units/test/test_predicates.cpp (original)
+++ sandbox/units/libs/units/test/test_predicates.cpp 2007-08-20 16:58:16 EDT (Mon, 20 Aug 2007)
@@ -42,7 +42,7 @@
struct dimension_tag : boost::units::base_dimension<dimension_tag,0> { };
-typedef dimension_tag::type dimension;
+typedef dimension_tag::dimension_type dimension;
struct base_unit1 : bu::base_unit<base_unit1, dimension, 100> {};
struct base_unit2 : bu::base_unit<base_unit2, dimension, 101> {};