|
Boost-Commit : |
From: boost_at_[hidden]
Date: 2008-05-15 16:57:48
Author: matthiasschabel
Date: 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
New Revision: 45407
URL: http://svn.boost.org/trac/boost/changeset/45407
Log:
change non-SI macro and some names/symbols, add atm, Julian year
Added:
sandbox/units/boost/units/systems/metric/atmosphere.hpp (contents, props changed)
sandbox/units/boost/units/systems/metric/year.hpp (contents, props changed)
Text files modified:
sandbox/units/boost/units/systems/astronomical/astronomical_unit.hpp | 3 +--
sandbox/units/boost/units/systems/astronomical/light_day.hpp | 2 +-
sandbox/units/boost/units/systems/astronomical/light_hour.hpp | 2 +-
sandbox/units/boost/units/systems/astronomical/light_minute.hpp | 2 +-
sandbox/units/boost/units/systems/astronomical/light_second.hpp | 2 +-
sandbox/units/boost/units/systems/astronomical/light_year.hpp | 2 +-
sandbox/units/boost/units/systems/astronomical/parsec.hpp | 2 +-
sandbox/units/boost/units/systems/detail/non_si_unit.hpp | 21 ++++++++++++++++++---
sandbox/units/boost/units/systems/imperial/pint.hpp | 2 +-
sandbox/units/boost/units/systems/imperial/pound.hpp | 2 +-
sandbox/units/boost/units/systems/metric/are.hpp | 2 +-
sandbox/units/boost/units/systems/metric/bar.hpp | 2 +-
sandbox/units/boost/units/systems/metric/barn.hpp | 2 +-
sandbox/units/boost/units/systems/metric/day.hpp | 2 +-
sandbox/units/boost/units/systems/metric/fermi.hpp | 1 +
sandbox/units/boost/units/systems/metric/hectare.hpp | 2 +-
sandbox/units/boost/units/systems/metric/hour.hpp | 2 +-
sandbox/units/boost/units/systems/metric/liter.hpp | 2 +-
sandbox/units/boost/units/systems/metric/ton.hpp | 2 +-
sandbox/units/boost/units/systems/nautical/fathom.hpp | 2 +-
sandbox/units/boost/units/systems/nautical/knot.hpp | 2 +-
sandbox/units/boost/units/systems/nautical/league.hpp | 2 +-
sandbox/units/boost/units/systems/nautical/nautical_mile.hpp | 2 +-
sandbox/units/boost/units/systems/survey/acre.hpp | 2 +-
sandbox/units/boost/units/systems/survey/chain.hpp | 2 +-
sandbox/units/boost/units/systems/survey/foot.hpp | 2 +-
sandbox/units/boost/units/systems/survey/mile.hpp | 2 +-
sandbox/units/boost/units/systems/survey/rod.hpp | 2 +-
sandbox/units/boost/units/systems/us/avoirdupois_dram.hpp | 2 +-
sandbox/units/boost/units/systems/us/dry_pint.hpp | 2 +-
sandbox/units/boost/units/systems/us/grain.hpp | 2 +-
31 files changed, 48 insertions(+), 33 deletions(-)
Modified: sandbox/units/boost/units/systems/astronomical/astronomical_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/astronomical/astronomical_unit.hpp (original)
+++ sandbox/units/boost/units/systems/astronomical/astronomical_unit.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,7 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-// TODO: what is the symbol???
-BOOST_UNITS_NON_SI_UNIT(astronomical, astronomical_unit, astronomical_unit, 149597870691.0, meter_base_unit, 0);
+BOOST_UNITS_NON_SI_UNIT(astronomical, astronomical_unit, "astronomical unit", "a.u.", 149597870691.0, meter_base_unit, 0);
#endif
Modified: sandbox/units/boost/units/systems/astronomical/light_day.hpp
==============================================================================
--- sandbox/units/boost/units/systems/astronomical/light_day.hpp (original)
+++ sandbox/units/boost/units/systems/astronomical/light_day.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(astronomical, light_day, light_day, 2.59020683712e13, meter_base_unit, 1);
+BOOST_UNITS_NON_SI_UNIT(astronomical, light_day, "light day", "ld", 2.59020683712e13, meter_base_unit, 1);
#endif
Modified: sandbox/units/boost/units/systems/astronomical/light_hour.hpp
==============================================================================
--- sandbox/units/boost/units/systems/astronomical/light_hour.hpp (original)
+++ sandbox/units/boost/units/systems/astronomical/light_hour.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(astronomical, light_hour, light_hour, 1.0792528488e12, meter_base_unit, 2);
+BOOST_UNITS_NON_SI_UNIT(astronomical, light_hour, "light hour", "lh", 1.0792528488e12, meter_base_unit, 2);
#endif
Modified: sandbox/units/boost/units/systems/astronomical/light_minute.hpp
==============================================================================
--- sandbox/units/boost/units/systems/astronomical/light_minute.hpp (original)
+++ sandbox/units/boost/units/systems/astronomical/light_minute.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(astronomical, light_minute, light_minute, 1.798754748e10, meter_base_unit, 3);
+BOOST_UNITS_NON_SI_UNIT(astronomical, light_minute, "light minute", "lm", 1.798754748e10, meter_base_unit, 3);
#endif
Modified: sandbox/units/boost/units/systems/astronomical/light_second.hpp
==============================================================================
--- sandbox/units/boost/units/systems/astronomical/light_second.hpp (original)
+++ sandbox/units/boost/units/systems/astronomical/light_second.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(astronomical, light_second, light_second, 2.99792458e8, meter_base_unit, 4);
+BOOST_UNITS_NON_SI_UNIT(astronomical, light_second, "light second", "ls", 2.99792458e8, meter_base_unit, 4);
#endif
Modified: sandbox/units/boost/units/systems/astronomical/light_year.hpp
==============================================================================
--- sandbox/units/boost/units/systems/astronomical/light_year.hpp (original)
+++ sandbox/units/boost/units/systems/astronomical/light_year.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(astronomical, light_year, light_year, 9.460730472580e15, meter_base_unit, 5);
+BOOST_UNITS_NON_SI_UNIT(astronomical, light_year, "light year", "ly", 9.460730472580e15, meter_base_unit, 5);
#endif
Modified: sandbox/units/boost/units/systems/astronomical/parsec.hpp
==============================================================================
--- sandbox/units/boost/units/systems/astronomical/parsec.hpp (original)
+++ sandbox/units/boost/units/systems/astronomical/parsec.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(astronomical, parsec, parsec, 3.0856775813e16, meter_base_unit, 6);
+BOOST_UNITS_NON_SI_UNIT(astronomical, parsec, "parsec", "parsec", 3.0856775813e16, meter_base_unit, 6);
#endif
Modified: sandbox/units/boost/units/systems/detail/non_si_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/detail/non_si_unit.hpp (original)
+++ sandbox/units/boost/units/systems/detail/non_si_unit.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -13,14 +13,29 @@
#include <boost/units/conversion.hpp>
-#define BOOST_UNITS_NON_SI_UNIT(namespace_, name_, symbol_, factor, unit, id)\
+//#define BOOST_UNITS_NON_SI_UNIT(namespace_, name_, symbol_, factor, unit, id)\
+//namespace boost { \
+//namespace units { \
+//namespace namespace_ { \
+//struct name_ ## _base_unit \
+// : base_unit<name_ ## _base_unit, unit::dimension_type, id - 100> { \
+// static const char* name() { return(#name_); } \
+// static const char* symbol() { return(#symbol_); }; \
+//}; \
+//} \
+//} \
+//} \
+//BOOST_UNITS_DEFINE_CONVERSION_FACTOR(namespace_::name_ ## _base_unit, unit, double, factor); \
+//BOOST_UNITS_DEFAULT_CONVERSION(namespace_::name_ ## _base_unit, unit)
+
+#define BOOST_UNITS_NON_SI_UNIT(namespace_, name_, name_string_, symbol_string_, factor, unit, id)\
namespace boost { \
namespace units { \
namespace namespace_ { \
struct name_ ## _base_unit \
: base_unit<name_ ## _base_unit, unit::dimension_type, id - 100> { \
- static const char* name() { return(#name_); } \
- static const char* symbol() { return(#symbol_); }; \
+ static const char* name() { return(name_string_); } \
+ static const char* symbol() { return(symbol_string_); }; \
}; \
} \
} \
Modified: sandbox/units/boost/units/systems/imperial/pint.hpp
==============================================================================
--- sandbox/units/boost/units/systems/imperial/pint.hpp (original)
+++ sandbox/units/boost/units/systems/imperial/pint.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/volume.hpp>
-BOOST_UNITS_NON_SI_UNIT(imperial, pint, pt, 0.56826125, SI::volume, 21); // exact conversion
+BOOST_UNITS_NON_SI_UNIT(imperial, pint, "pint", "pt", 0.56826125, SI::volume, 21); // exact conversion
#endif
Modified: sandbox/units/boost/units/systems/imperial/pound.hpp
==============================================================================
--- sandbox/units/boost/units/systems/imperial/pound.hpp (original)
+++ sandbox/units/boost/units/systems/imperial/pound.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/kilogram.hpp>
-BOOST_UNITS_NON_SI_UNIT(imperial, pound, lb, 0.45359237, kilogram_base_unit, 21);
+BOOST_UNITS_NON_SI_UNIT(imperial, pound, "pound", "lb", 0.45359237, kilogram_base_unit, 21);
#endif
Modified: sandbox/units/boost/units/systems/metric/are.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/are.hpp (original)
+++ sandbox/units/boost/units/systems/metric/are.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/area.hpp>
-BOOST_UNITS_NON_SI_UNIT(metric, are, are, 1.0e2, SI::area, 10);
+BOOST_UNITS_NON_SI_UNIT(metric, are, "are", "a", 1.0e2, SI::area, 10);
#endif
Added: sandbox/units/boost/units/systems/metric/atmosphere.hpp
==============================================================================
--- (empty file)
+++ sandbox/units/boost/units/systems/metric/atmosphere.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -0,0 +1,19 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2003-2008 Matthias Christian Schabel
+// Copyright (C) 2007-2008 Steven Watanabe
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNIT_SYSTEMS_OTHER_ATMOSPHERE_HPP_INCLUDED
+#define BOOST_UNIT_SYSTEMS_OTHER_ATMOSPHERE_HPP_INCLUDED
+
+#include <boost/units/systems/detail/non_si_unit.hpp>
+#include <boost/units/systems/si/pressure.hpp>
+
+BOOST_UNITS_NON_SI_UNIT(metric, atmosphere, "atmosphere", "atm", 1.01325e5, SI::pressure, 14);
+
+#endif
Modified: sandbox/units/boost/units/systems/metric/bar.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/bar.hpp (original)
+++ sandbox/units/boost/units/systems/metric/bar.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/pressure.hpp>
-BOOST_UNITS_NON_SI_UNIT(metric, bar, bar, 1.0e5, SI::pressure, 14);
+BOOST_UNITS_NON_SI_UNIT(metric, bar, "bar", "bar", 1.0e5, SI::pressure, 14);
#endif
Modified: sandbox/units/boost/units/systems/metric/barn.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/barn.hpp (original)
+++ sandbox/units/boost/units/systems/metric/barn.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/area.hpp>
-BOOST_UNITS_NON_SI_UNIT(metric, barn, barn, 1.0e-28, SI::area, 11);
+BOOST_UNITS_NON_SI_UNIT(metric, barn, "barn", "b", 1.0e-28, SI::area, 11);
#endif
Modified: sandbox/units/boost/units/systems/metric/day.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/day.hpp (original)
+++ sandbox/units/boost/units/systems/metric/day.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -27,7 +27,7 @@
template<>
struct base_unit_info<metric::day_base_unit> {
static const char* name() { return("day"); }
- static const char* symbol() { return("day"); }
+ static const char* symbol() { return("d"); }
};
}
Modified: sandbox/units/boost/units/systems/metric/fermi.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/fermi.hpp (original)
+++ sandbox/units/boost/units/systems/metric/fermi.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -29,6 +29,7 @@
static const char* name() { return("fermi"); }
static const char* symbol() { return("fm"); }
};
+
}
}
Modified: sandbox/units/boost/units/systems/metric/hectare.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/hectare.hpp (original)
+++ sandbox/units/boost/units/systems/metric/hectare.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/area.hpp>
-BOOST_UNITS_NON_SI_UNIT(metric, hectare, hectare, 1.0e4, SI::area, 12);
+BOOST_UNITS_NON_SI_UNIT(metric, hectare, "hectare", "ha", 1.0e4, SI::area, 12);
#endif
Modified: sandbox/units/boost/units/systems/metric/hour.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/hour.hpp (original)
+++ sandbox/units/boost/units/systems/metric/hour.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -28,7 +28,7 @@
template<>
struct base_unit_info<metric::hour_base_unit> {
static const char* name() { return("hour"); }
- static const char* symbol() { return("hr"); }
+ static const char* symbol() { return("h"); }
};
}
Modified: sandbox/units/boost/units/systems/metric/liter.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/liter.hpp (original)
+++ sandbox/units/boost/units/systems/metric/liter.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/volume.hpp>
-BOOST_UNITS_NON_SI_UNIT(metric, liter, L, 1.0e-3, SI::volume, 13);
+BOOST_UNITS_NON_SI_UNIT(metric, liter, "liter", "L", 1.0e-3, SI::volume, 13);
#endif
Modified: sandbox/units/boost/units/systems/metric/ton.hpp
==============================================================================
--- sandbox/units/boost/units/systems/metric/ton.hpp (original)
+++ sandbox/units/boost/units/systems/metric/ton.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -27,7 +27,7 @@
template<>
struct base_unit_info<metric::ton_base_unit> {
- static const char* name() { return("ton"); }
+ static const char* name() { return("metric ton"); }
static const char* symbol() { return("t"); }
};
Added: sandbox/units/boost/units/systems/metric/year.hpp
==============================================================================
--- (empty file)
+++ sandbox/units/boost/units/systems/metric/year.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -0,0 +1,38 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2003-2008 Matthias Christian Schabel
+// Copyright (C) 2007-2008 Steven Watanabe
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNIT_SYSTEMS_OTHER_YEAR_HPP_INCLUDED
+#define BOOST_UNIT_SYSTEMS_OTHER_YEAR_HPP_INCLUDED
+
+#include <boost/units/scaled_base_unit.hpp>
+#include <boost/units/static_rational.hpp>
+#include <boost/units/scale.hpp>
+#include <boost/units/systems/base_units/hour.hpp>
+
+// Julian year = 365.25 days exactly = 8766 hours exactly
+
+namespace boost {
+namespace units {
+namespace metric {
+
+typedef scaled_base_unit<units::hour_base_unit, scale<8766, static_rational<1> > > year_base_unit;
+
+}
+
+template<>
+struct base_unit_info<metric::day_base_unit> {
+ static const char* name() { return("Julian year"); }
+ static const char* symbol() { return("year"); }
+};
+
+}
+}
+
+#endif
Modified: sandbox/units/boost/units/systems/nautical/fathom.hpp
==============================================================================
--- sandbox/units/boost/units/systems/nautical/fathom.hpp (original)
+++ sandbox/units/boost/units/systems/nautical/fathom.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(nautical, fathom, fathom, 1.852, meter_base_unit, 15);
+BOOST_UNITS_NON_SI_UNIT(nautical, fathom, "fathom", "fathom", 1.852, meter_base_unit, 15);
#endif
Modified: sandbox/units/boost/units/systems/nautical/knot.hpp
==============================================================================
--- sandbox/units/boost/units/systems/nautical/knot.hpp (original)
+++ sandbox/units/boost/units/systems/nautical/knot.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/velocity.hpp>
-BOOST_UNITS_NON_SI_UNIT(nautical, knot, knot, (1852.0/3600.0), SI::velocity, 16);
+BOOST_UNITS_NON_SI_UNIT(nautical, knot, "knot", "knot", (1852.0/3600.0), SI::velocity, 16);
#endif
Modified: sandbox/units/boost/units/systems/nautical/league.hpp
==============================================================================
--- sandbox/units/boost/units/systems/nautical/league.hpp (original)
+++ sandbox/units/boost/units/systems/nautical/league.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(nautical, league, league, 5556.0, meter_base_unit, 17);
+BOOST_UNITS_NON_SI_UNIT(nautical, league, "league", "league", 5556.0, meter_base_unit, 17);
#endif
Modified: sandbox/units/boost/units/systems/nautical/nautical_mile.hpp
==============================================================================
--- sandbox/units/boost/units/systems/nautical/nautical_mile.hpp (original)
+++ sandbox/units/boost/units/systems/nautical/nautical_mile.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(nautical, nautical_mile, nautical_mile, 1852.0, meter_base_unit, 18);
+BOOST_UNITS_NON_SI_UNIT(nautical, nautical_mile, "nautical mile", "nautical mile", 1852.0, meter_base_unit, 18);
#endif
Modified: sandbox/units/boost/units/systems/survey/acre.hpp
==============================================================================
--- sandbox/units/boost/units/systems/survey/acre.hpp (original)
+++ sandbox/units/boost/units/systems/survey/acre.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/area.hpp>
-BOOST_UNITS_NON_SI_UNIT(survey, acre, acre, 4046.873, SI::area, 29);
+BOOST_UNITS_NON_SI_UNIT(survey, acre, "acre", "acre", 4046.873, SI::area, 29);
#endif
Modified: sandbox/units/boost/units/systems/survey/chain.hpp
==============================================================================
--- sandbox/units/boost/units/systems/survey/chain.hpp (original)
+++ sandbox/units/boost/units/systems/survey/chain.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(survey, chain, chain, 20.11684, meter_base_unit, 27);
+BOOST_UNITS_NON_SI_UNIT(survey, chain, "chain", "chain", 20.11684, meter_base_unit, 27);
#endif
Modified: sandbox/units/boost/units/systems/survey/foot.hpp
==============================================================================
--- sandbox/units/boost/units/systems/survey/foot.hpp (original)
+++ sandbox/units/boost/units/systems/survey/foot.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(survey, foot, foot, 0.3048006, meter_base_unit, 25);
+BOOST_UNITS_NON_SI_UNIT(survey, foot, "foot", "foot", 0.3048006, meter_base_unit, 25);
#endif
Modified: sandbox/units/boost/units/systems/survey/mile.hpp
==============================================================================
--- sandbox/units/boost/units/systems/survey/mile.hpp (original)
+++ sandbox/units/boost/units/systems/survey/mile.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(survey, mile, mile, 1609.347, meter_base_unit, 28);
+BOOST_UNITS_NON_SI_UNIT(survey, mile, "mile", "mile", 1609.347, meter_base_unit, 28);
#endif
Modified: sandbox/units/boost/units/systems/survey/rod.hpp
==============================================================================
--- sandbox/units/boost/units/systems/survey/rod.hpp (original)
+++ sandbox/units/boost/units/systems/survey/rod.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/meter.hpp>
-BOOST_UNITS_NON_SI_UNIT(survey, rod, rod, 5.029210, meter_base_unit, 26);
+BOOST_UNITS_NON_SI_UNIT(survey, rod, "rod", "rod", 5.029210, meter_base_unit, 26);
#endif
Modified: sandbox/units/boost/units/systems/us/avoirdupois_dram.hpp
==============================================================================
--- sandbox/units/boost/units/systems/us/avoirdupois_dram.hpp (original)
+++ sandbox/units/boost/units/systems/us/avoirdupois_dram.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/kilogram.hpp>
-BOOST_UNITS_NON_SI_UNIT(us, avoirdupois_dram, avoirdupois_dram, 1.7718451953125e-3, kilogram_base_unit, 21);
+BOOST_UNITS_NON_SI_UNIT(us, avoirdupois_dram, "avoirdupois_dram", "avoirdupois_dram", 1.7718451953125e-3, kilogram_base_unit, 21);
#endif
Modified: sandbox/units/boost/units/systems/us/dry_pint.hpp
==============================================================================
--- sandbox/units/boost/units/systems/us/dry_pint.hpp (original)
+++ sandbox/units/boost/units/systems/us/dry_pint.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/si/volume.hpp>
-BOOST_UNITS_NON_SI_UNIT(us, dry_pint, dry_pint, 5.506105e-4, SI::volume, 20);
+BOOST_UNITS_NON_SI_UNIT(us, dry_pint, "dry pint", "pt", 5.506105e-4, SI::volume, 20);
#endif
Modified: sandbox/units/boost/units/systems/us/grain.hpp
==============================================================================
--- sandbox/units/boost/units/systems/us/grain.hpp (original)
+++ sandbox/units/boost/units/systems/us/grain.hpp 2008-05-15 16:57:45 EDT (Thu, 15 May 2008)
@@ -14,6 +14,6 @@
#include <boost/units/systems/detail/non_si_unit.hpp>
#include <boost/units/systems/base_units/kilogram.hpp>
-BOOST_UNITS_NON_SI_UNIT(us, grain, grain, 6.479891e-5, kilogram_base_unit, 23);
+BOOST_UNITS_NON_SI_UNIT(us, grain, "grain", "grain", 6.479891e-5, kilogram_base_unit, 23);
#endif
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