Imported Upstream version 1.67.0upstream/1.67.0

53 files changed, 106 insertions, 106 deletions

diff --git a/boost/units/base_units/angle/arcminute.hpp b/boost/units/base_units/angle/arcminute.hpp
index 86bf5e0fa3..27570fbbbb 100644
--- a/boost/units/base_units/angle/arcminute.hpp
+++ b/boost/units/base_units/angle/arcminute.hpp
@@ -26,8 +26,8 @@ typedef scaled_base_unit<degree_base_unit, scale<60, static_rational<-1> > >  ar
 
 template<>
 struct base_unit_info<angle::arcminute_base_unit> {
-    static const char* name()   { return("arcminute"); }
-    static const char* symbol() { return("'"); }
+    static BOOST_CONSTEXPR const char* name()   { return("arcminute"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("'"); }
 };
 
 }
diff --git a/boost/units/base_units/angle/arcsecond.hpp b/boost/units/base_units/angle/arcsecond.hpp
index 8baabfa6ec..97851ffb70 100644
--- a/boost/units/base_units/angle/arcsecond.hpp
+++ b/boost/units/base_units/angle/arcsecond.hpp
@@ -27,8 +27,8 @@ typedef scaled_base_unit<degree_base_unit, scale<3600, static_rational<-1> > >
 
 template<>
 struct base_unit_info<angle::arcsecond_base_unit> {
-    static const char* name()   { return("arcsecond"); }
-    static const char* symbol() { return("\""); }
+    static BOOST_CONSTEXPR const char* name()   { return("arcsecond"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("\""); }
 };
 
 }
diff --git a/boost/units/base_units/angle/revolution.hpp b/boost/units/base_units/angle/revolution.hpp
index 2dd0d5b9bf..3d576286ef 100644
--- a/boost/units/base_units/angle/revolution.hpp
+++ b/boost/units/base_units/angle/revolution.hpp
@@ -26,8 +26,8 @@ typedef scaled_base_unit<degree_base_unit, scale<360, static_rational<1> > >  re
 
 template<>
 struct base_unit_info<angle::revolution_base_unit> {
-    static const char* name()   { return("revolution"); }
-    static const char* symbol() { return("rev"); }
+    static BOOST_CONSTEXPR const char* name()   { return("revolution"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("rev"); }
 };
 
 }
diff --git a/boost/units/base_units/astronomical/light_day.hpp b/boost/units/base_units/astronomical/light_day.hpp
index 2d045ff2e1..a0ad93becb 100644
--- a/boost/units/base_units/astronomical/light_day.hpp
+++ b/boost/units/base_units/astronomical/light_day.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<boost::units::astronomical::light_second_base_unit, sca
 
 template<>
 struct base_unit_info<astronomical::light_day_base_unit> {
-    static const char* name()   { return("light day"); }
-    static const char* symbol() { return("ldy"); }
+    static BOOST_CONSTEXPR const char* name()   { return("light day"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("ldy"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/astronomical/light_hour.hpp b/boost/units/base_units/astronomical/light_hour.hpp
index 207d951a46..91bc09a28c 100644
--- a/boost/units/base_units/astronomical/light_hour.hpp
+++ b/boost/units/base_units/astronomical/light_hour.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<boost::units::astronomical::light_second_base_unit, sca
 
 template<>
 struct base_unit_info<astronomical::light_hour_base_unit> {
-    static const char* name()   { return("light hour"); }
-    static const char* symbol() { return("lhr"); }
+    static BOOST_CONSTEXPR const char* name()   { return("light hour"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("lhr"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/astronomical/light_minute.hpp b/boost/units/base_units/astronomical/light_minute.hpp
index f0bd095636..6301745c29 100644
--- a/boost/units/base_units/astronomical/light_minute.hpp
+++ b/boost/units/base_units/astronomical/light_minute.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<boost::units::astronomical::light_second_base_unit, sca
 
 template<>
 struct base_unit_info<astronomical::light_minute_base_unit> {
-    static const char* name()   { return("light minute"); }
-    static const char* symbol() { return("lmn"); }
+    static BOOST_CONSTEXPR const char* name()   { return("light minute"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("lmn"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/astronomical/light_year.hpp b/boost/units/base_units/astronomical/light_year.hpp
index e9e83a3acb..f3434a7918 100644
--- a/boost/units/base_units/astronomical/light_year.hpp
+++ b/boost/units/base_units/astronomical/light_year.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<boost::units::astronomical::light_second_base_unit, sca
 
 template<>
 struct base_unit_info<astronomical::light_year_base_unit> {
-    static const char* name()   { return("light year"); }
-    static const char* symbol() { return("ly"); }
+    static BOOST_CONSTEXPR const char* name()   { return("light year"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("ly"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/drachm.hpp b/boost/units/base_units/imperial/drachm.hpp
index 3dcc024074..b965040c3b 100644
--- a/boost/units/base_units/imperial/drachm.hpp
+++ b/boost/units/base_units/imperial/drachm.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<16, static_rational<-2> > > drac
 
 template<>
 struct base_unit_info<imperial::drachm_base_unit> {
-    static const char* name()   { return("drachm"); }
-    static const char* symbol() { return("drachm"); }
+    static BOOST_CONSTEXPR const char* name()   { return("drachm"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("drachm"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/fluid_ounce.hpp b/boost/units/base_units/imperial/fluid_ounce.hpp
index 8bab33eb2d..b318fb2c9f 100644
--- a/boost/units/base_units/imperial/fluid_ounce.hpp
+++ b/boost/units/base_units/imperial/fluid_ounce.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<20, static_rational<-1> > > fluid
 
 template<>
 struct base_unit_info<imperial::fluid_ounce_base_unit> {
-    static const char* name()   { return("fluid ounce (imp.)"); }
-    static const char* symbol() { return("fl oz"); }
+    static BOOST_CONSTEXPR const char* name()   { return("fluid ounce (imp.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("fl oz"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/foot.hpp b/boost/units/base_units/imperial/foot.hpp
index 149985e867..429c77c7b0 100644
--- a/boost/units/base_units/imperial/foot.hpp
+++ b/boost/units/base_units/imperial/foot.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<3, static_rational<-1> > > foot_b
 
 template<>
 struct base_unit_info<imperial::foot_base_unit> {
-    static const char* name()   { return("foot"); }
-    static const char* symbol() { return("ft"); }
+    static BOOST_CONSTEXPR const char* name()   { return("foot"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("ft"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/furlong.hpp b/boost/units/base_units/imperial/furlong.hpp
index 1d988214ae..8851f2c0e9 100644
--- a/boost/units/base_units/imperial/furlong.hpp
+++ b/boost/units/base_units/imperial/furlong.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<220, static_rational<1> > > furlo
 
 template<>
 struct base_unit_info<imperial::furlong_base_unit> {
-    static const char* name()   { return("furlong"); }
-    static const char* symbol() { return("furlong"); }
+    static BOOST_CONSTEXPR const char* name()   { return("furlong"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("furlong"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/gallon.hpp b/boost/units/base_units/imperial/gallon.hpp
index 6fd46538ff..c0e1513631 100644
--- a/boost/units/base_units/imperial/gallon.hpp
+++ b/boost/units/base_units/imperial/gallon.hpp
@@ -29,8 +29,8 @@ typedef scaled_base_unit<pint_base_unit, scale<8, static_rational<1> > > gallon_
 
 template<>
 struct base_unit_info<imperial::gallon_base_unit> {
-    static const char* name()   { return("gallon (imp.)"); }
-    static const char* symbol() { return("gal"); }
+    static BOOST_CONSTEXPR const char* name()   { return("gallon (imp.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("gal"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/gill.hpp b/boost/units/base_units/imperial/gill.hpp
index 3e5b83af3e..353a46b409 100644
--- a/boost/units/base_units/imperial/gill.hpp
+++ b/boost/units/base_units/imperial/gill.hpp
@@ -29,8 +29,8 @@ typedef scaled_base_unit<pint_base_unit, scale<4, static_rational<-1> > > gill_b
 
 template<>
 struct base_unit_info<imperial::gill_base_unit> {
-    static const char* name()   { return("gill (imp.)"); }
-    static const char* symbol() { return("gill"); }
+    static BOOST_CONSTEXPR const char* name()   { return("gill (imp.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("gill"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/grain.hpp b/boost/units/base_units/imperial/grain.hpp
index a36b4a4d2e..7567f9912e 100644
--- a/boost/units/base_units/imperial/grain.hpp
+++ b/boost/units/base_units/imperial/grain.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<7000, static_rational<-1> > > gr
 
 template<>
 struct base_unit_info<imperial::grain_base_unit> {
-    static const char* name()   { return("grain"); }
-    static const char* symbol() { return("grain"); }
+    static BOOST_CONSTEXPR const char* name()   { return("grain"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("grain"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/hundredweight.hpp b/boost/units/base_units/imperial/hundredweight.hpp
index 6709a788e0..8f03763ff6 100644
--- a/boost/units/base_units/imperial/hundredweight.hpp
+++ b/boost/units/base_units/imperial/hundredweight.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<112, static_rational<1> > > hund
 
 template<>
 struct base_unit_info<imperial::hundredweight_base_unit> {
-    static const char* name()   { return("hundredweight"); }
-    static const char* symbol() { return("cwt"); }
+    static BOOST_CONSTEXPR const char* name()   { return("hundredweight"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("cwt"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/inch.hpp b/boost/units/base_units/imperial/inch.hpp
index 048d8c6710..d39c332342 100644
--- a/boost/units/base_units/imperial/inch.hpp
+++ b/boost/units/base_units/imperial/inch.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<36, static_rational<-1> > > inch_
 
 template<>
 struct base_unit_info<imperial::inch_base_unit> {
-    static const char* name()   { return("inch"); }
-    static const char* symbol() { return("in"); }
+    static BOOST_CONSTEXPR const char* name()   { return("inch"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("in"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/league.hpp b/boost/units/base_units/imperial/league.hpp
index 991e4b6025..87c0cfb575 100644
--- a/boost/units/base_units/imperial/league.hpp
+++ b/boost/units/base_units/imperial/league.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<5280, static_rational<1> > > leag
 
 template<>
 struct base_unit_info<imperial::league_base_unit> {
-    static const char* name()   { return("league"); }
-    static const char* symbol() { return("league"); }
+    static BOOST_CONSTEXPR const char* name()   { return("league"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("league"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/mile.hpp b/boost/units/base_units/imperial/mile.hpp
index d0d0fb5a15..230537f5b3 100644
--- a/boost/units/base_units/imperial/mile.hpp
+++ b/boost/units/base_units/imperial/mile.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<1760, static_rational<1> > > mile
 
 template<>
 struct base_unit_info<imperial::mile_base_unit> {
-    static const char* name()   { return("mile"); }
-    static const char* symbol() { return("mi"); }
+    static BOOST_CONSTEXPR const char* name()   { return("mile"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("mi"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/ounce.hpp b/boost/units/base_units/imperial/ounce.hpp
index 8b9e33afc9..05bfcc1594 100644
--- a/boost/units/base_units/imperial/ounce.hpp
+++ b/boost/units/base_units/imperial/ounce.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<2, static_rational<-4> > > ounce
 
 template<>
 struct base_unit_info<imperial::ounce_base_unit> {
-    static const char* name()   { return("ounce"); }
-    static const char* symbol() { return("oz"); }
+    static BOOST_CONSTEXPR const char* name()   { return("ounce"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("oz"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/quart.hpp b/boost/units/base_units/imperial/quart.hpp
index 723ce0b4a2..f4c0a00995 100644
--- a/boost/units/base_units/imperial/quart.hpp
+++ b/boost/units/base_units/imperial/quart.hpp
@@ -29,8 +29,8 @@ typedef scaled_base_unit<pint_base_unit, scale<2, static_rational<1> > > quart_b
 
 template<>
 struct base_unit_info<imperial::quart_base_unit> {
-    static const char* name()   { return("quart (imp.)"); }
-    static const char* symbol() { return("qt"); }
+    static BOOST_CONSTEXPR const char* name()   { return("quart (imp.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("qt"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/quarter.hpp b/boost/units/base_units/imperial/quarter.hpp
index 30f0594fad..912d51d78d 100644
--- a/boost/units/base_units/imperial/quarter.hpp
+++ b/boost/units/base_units/imperial/quarter.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<28, static_rational<1> > > quart
 
 template<>
 struct base_unit_info<imperial::quarter_base_unit> {
-    static const char* name()   { return("quarter"); }
-    static const char* symbol() { return("quarter"); }
+    static BOOST_CONSTEXPR const char* name()   { return("quarter"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("quarter"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/stone.hpp b/boost/units/base_units/imperial/stone.hpp
index b4ce433838..1b260a29e3 100644
--- a/boost/units/base_units/imperial/stone.hpp
+++ b/boost/units/base_units/imperial/stone.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<14, static_rational<1> > > stone
 
 template<>
 struct base_unit_info<imperial::stone_base_unit> {
-    static const char* name()   { return("stone"); }
-    static const char* symbol() { return("st"); }
+    static BOOST_CONSTEXPR const char* name()   { return("stone"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("st"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/thou.hpp b/boost/units/base_units/imperial/thou.hpp
index eab2ac9e4e..af1f911e46 100644
--- a/boost/units/base_units/imperial/thou.hpp
+++ b/boost/units/base_units/imperial/thou.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<36000, static_rational<-1> > > th
 
 template<>
 struct base_unit_info<imperial::thou_base_unit> {
-    static const char* name()   { return("thou"); }
-    static const char* symbol() { return("thou"); }
+    static BOOST_CONSTEXPR const char* name()   { return("thou"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("thou"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/imperial/ton.hpp b/boost/units/base_units/imperial/ton.hpp
index 867f14738c..a1f709ec6b 100644
--- a/boost/units/base_units/imperial/ton.hpp
+++ b/boost/units/base_units/imperial/ton.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<2240, static_rational<1> > > ton
 
 template<>
 struct base_unit_info<imperial::ton_base_unit> {
-    static const char* name()   { return("long ton"); }
-    static const char* symbol() { return("t"); }
+    static BOOST_CONSTEXPR const char* name()   { return("long ton"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("t"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/information/byte.hpp b/boost/units/base_units/information/byte.hpp
index 6cd9692d3b..6dcfde2557 100644
--- a/boost/units/base_units/information/byte.hpp
+++ b/boost/units/base_units/information/byte.hpp
@@ -26,8 +26,8 @@ typedef scaled_base_unit<boost::units::information::bit_base_unit, scale<2, stat
 
 template<>
 struct base_unit_info<information::byte_base_unit> {
-    static const char* name()   { return("byte"); }
-    static const char* symbol() { return("B"); }
+    static BOOST_CONSTEXPR const char* name()   { return("byte"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("B"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/information/shannon.hpp b/boost/units/base_units/information/shannon.hpp
index b52bf7afb9..60e37b2cd9 100644
--- a/boost/units/base_units/information/shannon.hpp
+++ b/boost/units/base_units/information/shannon.hpp
@@ -26,8 +26,8 @@ typedef scaled_base_unit<boost::units::information::bit_base_unit, scale<1, stat
 
 template<>
 struct base_unit_info<information::shannon_base_unit> {
-    static const char* name()   { return("shannon"); }
-    static const char* symbol() { return("Sh"); }
+    static BOOST_CONSTEXPR const char* name()   { return("shannon"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("Sh"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/metric/angstrom.hpp b/boost/units/base_units/metric/angstrom.hpp
index d2954e3114..64cc3379be 100644
--- a/boost/units/base_units/metric/angstrom.hpp
+++ b/boost/units/base_units/metric/angstrom.hpp
@@ -27,8 +27,8 @@ typedef scaled_base_unit<boost::units::si::meter_base_unit, scale<10, static_rat
 
 template<>
 struct base_unit_info<metric::angstrom_base_unit> {
-    static const char* name()   { return("angstrom"); }
-    static const char* symbol() { return("A"); }
+    static BOOST_CONSTEXPR const char* name()   { return("angstrom"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("A"); }
 };
 
 }
diff --git a/boost/units/base_units/metric/day.hpp b/boost/units/base_units/metric/day.hpp
index f8d83c8af8..ac111c9ee0 100644
--- a/boost/units/base_units/metric/day.hpp
+++ b/boost/units/base_units/metric/day.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<boost::units::si::second_base_unit, scale<86400, static
 
 template<>
 struct base_unit_info<metric::day_base_unit> {
-    static const char* name()   { return("day"); }
-    static const char* symbol() { return("d"); }
+    static BOOST_CONSTEXPR const char* name()   { return("day"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("d"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/metric/fermi.hpp b/boost/units/base_units/metric/fermi.hpp
index 8732c4ef01..f12c903f49 100644
--- a/boost/units/base_units/metric/fermi.hpp
+++ b/boost/units/base_units/metric/fermi.hpp
@@ -26,8 +26,8 @@ typedef scaled_base_unit<boost::units::si::meter_base_unit, scale<10, static_rat
 
 template<>
 struct base_unit_info<metric::fermi_base_unit> {
-    static const char* name()   { return("fermi"); }
-    static const char* symbol() { return("fm"); }
+    static BOOST_CONSTEXPR const char* name()   { return("fermi"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("fm"); }
 };
 
 }
diff --git a/boost/units/base_units/metric/hour.hpp b/boost/units/base_units/metric/hour.hpp
index 443e250378..65657ce030 100644
--- a/boost/units/base_units/metric/hour.hpp
+++ b/boost/units/base_units/metric/hour.hpp
@@ -27,8 +27,8 @@ typedef scaled_base_unit<boost::units::si::second_base_unit, scale<60, static_ra
 
 template<>
 struct base_unit_info<metric::hour_base_unit> {
-    static const char* name()   { return("hour"); }
-    static const char* symbol() { return("h"); }
+    static BOOST_CONSTEXPR const char* name()   { return("hour"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("h"); }
 };
 
 }
diff --git a/boost/units/base_units/metric/micron.hpp b/boost/units/base_units/metric/micron.hpp
index 0965836079..c169cfdb32 100644
--- a/boost/units/base_units/metric/micron.hpp
+++ b/boost/units/base_units/metric/micron.hpp
@@ -26,8 +26,8 @@ typedef scaled_base_unit<boost::units::si::meter_base_unit, scale<10, static_rat
 
 template<>
 struct base_unit_info<metric::micron_base_unit> {
-    static const char* name()   { return("micron"); }
-    static const char* symbol() { return("u"); }
+    static BOOST_CONSTEXPR const char* name()   { return("micron"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("u"); }
 };
 
 }
diff --git a/boost/units/base_units/metric/minute.hpp b/boost/units/base_units/metric/minute.hpp
index c2f9e6b397..3c0a68fc2c 100644
--- a/boost/units/base_units/metric/minute.hpp
+++ b/boost/units/base_units/metric/minute.hpp
@@ -27,8 +27,8 @@ typedef scaled_base_unit<boost::units::si::second_base_unit, scale<60, static_ra
 
 template<>
 struct base_unit_info<metric::minute_base_unit> {
-    static const char* name()   { return("minute"); }
-    static const char* symbol() { return("min"); }
+    static BOOST_CONSTEXPR const char* name()   { return("minute"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("min"); }
 };
 
 }
diff --git a/boost/units/base_units/metric/nautical_mile.hpp b/boost/units/base_units/metric/nautical_mile.hpp
index d42dd77e4b..4f20951af8 100644
--- a/boost/units/base_units/metric/nautical_mile.hpp
+++ b/boost/units/base_units/metric/nautical_mile.hpp
@@ -26,8 +26,8 @@ typedef scaled_base_unit<boost::units::si::meter_base_unit, scale<1852, static_r
 
 template<>
 struct base_unit_info<metric::nautical_mile_base_unit> {
-    static const char* name()   { return("nautical mile"); }
-    static const char* symbol() { return("nmi"); }
+    static BOOST_CONSTEXPR const char* name()   { return("nautical mile"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("nmi"); }
 };
 
 }
diff --git a/boost/units/base_units/metric/ton.hpp b/boost/units/base_units/metric/ton.hpp
index a842aaab00..4f8e9643cd 100644
--- a/boost/units/base_units/metric/ton.hpp
+++ b/boost/units/base_units/metric/ton.hpp
@@ -29,8 +29,8 @@ typedef scaled_base_unit<boost::units::si::kilogram_base_unit, scale<1000, stati
 
 template<>
 struct base_unit_info<metric::ton_base_unit> {
-    static const char* name()   { return("metric ton"); }
-    static const char* symbol() { return("t"); }
+    static BOOST_CONSTEXPR const char* name()   { return("metric ton"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("t"); }
 };
 
 }
diff --git a/boost/units/base_units/metric/year.hpp b/boost/units/base_units/metric/year.hpp
index e43acd6dd6..5d715e2de1 100644
--- a/boost/units/base_units/metric/year.hpp
+++ b/boost/units/base_units/metric/year.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<boost::units::si::second_base_unit, scale<31557600, sta
 
 template<>
 struct base_unit_info<metric::year_base_unit> {
-    static const char* name()   { return("Julian year"); }
-    static const char* symbol() { return("yr"); }
+    static BOOST_CONSTEXPR const char* name()   { return("Julian year"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("yr"); }
 };
 
 }
diff --git a/boost/units/base_units/us/cup.hpp b/boost/units/base_units/us/cup.hpp
index f811373304..86b408322c 100644
--- a/boost/units/base_units/us/cup.hpp
+++ b/boost/units/base_units/us/cup.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<2, static_rational<-1> > > cup_ba
 
 template<>
 struct base_unit_info<us::cup_base_unit> {
-    static const char* name()   { return("cup"); }
-    static const char* symbol() { return("c"); }
+    static BOOST_CONSTEXPR const char* name()   { return("cup"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("c"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/dram.hpp b/boost/units/base_units/us/dram.hpp
index 73fc44ff31..29e08d9e79 100644
--- a/boost/units/base_units/us/dram.hpp
+++ b/boost/units/base_units/us/dram.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<16, static_rational<-2> > > dram
 
 template<>
 struct base_unit_info<us::dram_base_unit> {
-    static const char* name()   { return("dram (U.S.)"); }
-    static const char* symbol() { return("dr"); }
+    static BOOST_CONSTEXPR const char* name()   { return("dram (U.S.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("dr"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/fluid_dram.hpp b/boost/units/base_units/us/fluid_dram.hpp
index cf0c85d3c7..0b9c60d766 100644
--- a/boost/units/base_units/us/fluid_dram.hpp
+++ b/boost/units/base_units/us/fluid_dram.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<2, static_rational<-7> > > fluid_
 
 template<>
 struct base_unit_info<us::fluid_dram_base_unit> {
-    static const char* name()   { return("fluid dram (U.S.)"); }
-    static const char* symbol() { return("fl dr"); }
+    static BOOST_CONSTEXPR const char* name()   { return("fluid dram (U.S.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("fl dr"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/fluid_ounce.hpp b/boost/units/base_units/us/fluid_ounce.hpp
index 0c9d7e9943..c7f0f07ee8 100644
--- a/boost/units/base_units/us/fluid_ounce.hpp
+++ b/boost/units/base_units/us/fluid_ounce.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<16, static_rational<-1> > > fluid
 
 template<>
 struct base_unit_info<us::fluid_ounce_base_unit> {
-    static const char* name()   { return("fluid ounce (U.S.)"); }
-    static const char* symbol() { return("fl oz"); }
+    static BOOST_CONSTEXPR const char* name()   { return("fluid ounce (U.S.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("fl oz"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/foot.hpp b/boost/units/base_units/us/foot.hpp
index 4b529bb6a4..16cbf6d2b4 100644
--- a/boost/units/base_units/us/foot.hpp
+++ b/boost/units/base_units/us/foot.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<3, static_rational<-1> > > foot_b
 
 template<>
 struct base_unit_info<us::foot_base_unit> {
-    static const char* name()   { return("foot"); }
-    static const char* symbol() { return("ft"); }
+    static BOOST_CONSTEXPR const char* name()   { return("foot"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("ft"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/gallon.hpp b/boost/units/base_units/us/gallon.hpp
index a7314c58e4..1b54b28f19 100644
--- a/boost/units/base_units/us/gallon.hpp
+++ b/boost/units/base_units/us/gallon.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<2, static_rational<3> > > gallon_
 
 template<>
 struct base_unit_info<us::gallon_base_unit> {
-    static const char* name()   { return("gallon (U.S.)"); }
-    static const char* symbol() { return("gal"); }
+    static BOOST_CONSTEXPR const char* name()   { return("gallon (U.S.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("gal"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/gill.hpp b/boost/units/base_units/us/gill.hpp
index e9373439b6..c654386a21 100644
--- a/boost/units/base_units/us/gill.hpp
+++ b/boost/units/base_units/us/gill.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<2, static_rational<-2> > > gill_b
 
 template<>
 struct base_unit_info<us::gill_base_unit> {
-    static const char* name()   { return("gill (U.S.)"); }
-    static const char* symbol() { return("gi"); }
+    static BOOST_CONSTEXPR const char* name()   { return("gill (U.S.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("gi"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/grain.hpp b/boost/units/base_units/us/grain.hpp
index e21baf6916..485b68723f 100644
--- a/boost/units/base_units/us/grain.hpp
+++ b/boost/units/base_units/us/grain.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<7000, static_rational<-1> > > gr
 
 template<>
 struct base_unit_info<us::grain_base_unit> {
-    static const char* name()   { return("grain"); }
-    static const char* symbol() { return("gr"); }
+    static BOOST_CONSTEXPR const char* name()   { return("grain"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("gr"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/hundredweight.hpp b/boost/units/base_units/us/hundredweight.hpp
index 0bccd4922e..2ac991b975 100644
--- a/boost/units/base_units/us/hundredweight.hpp
+++ b/boost/units/base_units/us/hundredweight.hpp
@@ -29,8 +29,8 @@ typedef scaled_base_unit<pound_base_unit, scale<100, static_rational<1> > > hund
 
 template<>
 struct base_unit_info<us::hundredweight_base_unit> {
-    static const char* name()   { return("hundredweight (U.S.)"); }
-    static const char* symbol() { return("cwt"); }
+    static BOOST_CONSTEXPR const char* name()   { return("hundredweight (U.S.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("cwt"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/inch.hpp b/boost/units/base_units/us/inch.hpp
index 05bd59a248..e7bd91da5a 100644
--- a/boost/units/base_units/us/inch.hpp
+++ b/boost/units/base_units/us/inch.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<36, static_rational<-1> > > inch_
 
 template<>
 struct base_unit_info<us::inch_base_unit> {
-    static const char* name()   { return("inch"); }
-    static const char* symbol() { return("in"); }
+    static BOOST_CONSTEXPR const char* name()   { return("inch"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("in"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/mil.hpp b/boost/units/base_units/us/mil.hpp
index ee75b79ab8..e3276fe7b8 100644
--- a/boost/units/base_units/us/mil.hpp
+++ b/boost/units/base_units/us/mil.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<36000, static_rational<-1> > > mi
 
 template<>
 struct base_unit_info<us::mil_base_unit> {
-    static const char* name()   { return("mil"); }
-    static const char* symbol() { return("mil"); }
+    static BOOST_CONSTEXPR const char* name()   { return("mil"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("mil"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/mile.hpp b/boost/units/base_units/us/mile.hpp
index d3513f13d0..c62c0d5fc8 100644
--- a/boost/units/base_units/us/mile.hpp
+++ b/boost/units/base_units/us/mile.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<yard_base_unit, scale<1760, static_rational<1> > > mile
 
 template<>
 struct base_unit_info<us::mile_base_unit> {
-    static const char* name()   { return("mile"); }
-    static const char* symbol() { return("mi"); }
+    static BOOST_CONSTEXPR const char* name()   { return("mile"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("mi"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/minim.hpp b/boost/units/base_units/us/minim.hpp
index bf266cdba4..d877e2652c 100644
--- a/boost/units/base_units/us/minim.hpp
+++ b/boost/units/base_units/us/minim.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<7680, static_rational<-1> > > min
 
 template<>
 struct base_unit_info<us::minim_base_unit> {
-    static const char* name()   { return("minim (U.S.)"); }
-    static const char* symbol() { return("minim"); }
+    static BOOST_CONSTEXPR const char* name()   { return("minim (U.S.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("minim"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/ounce.hpp b/boost/units/base_units/us/ounce.hpp
index 5f88f8386f..9a4ec3e63a 100644
--- a/boost/units/base_units/us/ounce.hpp
+++ b/boost/units/base_units/us/ounce.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<2, static_rational<-4> > > ounce
 
 template<>
 struct base_unit_info<us::ounce_base_unit> {
-    static const char* name()   { return("ounce"); }
-    static const char* symbol() { return("oz"); }
+    static BOOST_CONSTEXPR const char* name()   { return("ounce"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("oz"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/quart.hpp b/boost/units/base_units/us/quart.hpp
index 45cf6a961a..b39252a418 100644
--- a/boost/units/base_units/us/quart.hpp
+++ b/boost/units/base_units/us/quart.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<2, static_rational<1> > > quart_b
 
 template<>
 struct base_unit_info<us::quart_base_unit> {
-    static const char* name()   { return("quart (U.S.)"); }
-    static const char* symbol() { return("qt"); }
+    static BOOST_CONSTEXPR const char* name()   { return("quart (U.S.)"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("qt"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/tablespoon.hpp b/boost/units/base_units/us/tablespoon.hpp
index f95f0a2b9a..43418ed3eb 100644
--- a/boost/units/base_units/us/tablespoon.hpp
+++ b/boost/units/base_units/us/tablespoon.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<2, static_rational<-5> > > tables
 
 template<>
 struct base_unit_info<us::tablespoon_base_unit> {
-    static const char* name()   { return("tablespoon"); }
-    static const char* symbol() { return("tbsp"); }
+    static BOOST_CONSTEXPR const char* name()   { return("tablespoon"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("tbsp"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/teaspoon.hpp b/boost/units/base_units/us/teaspoon.hpp
index 8f8dd73d1c..94fe655b7e 100644
--- a/boost/units/base_units/us/teaspoon.hpp
+++ b/boost/units/base_units/us/teaspoon.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pint_base_unit, scale<96, static_rational<-1> > > teasp
 
 template<>
 struct base_unit_info<us::teaspoon_base_unit> {
-    static const char* name()   { return("teaspoon"); }
-    static const char* symbol() { return("tsp"); }
+    static BOOST_CONSTEXPR const char* name()   { return("teaspoon"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("tsp"); }
 };
 
 } // namespace units
diff --git a/boost/units/base_units/us/ton.hpp b/boost/units/base_units/us/ton.hpp
index 84daa85a73..d1f52e8319 100644
--- a/boost/units/base_units/us/ton.hpp
+++ b/boost/units/base_units/us/ton.hpp
@@ -28,8 +28,8 @@ typedef scaled_base_unit<pound_base_unit, scale<2000, static_rational<1> > > ton
 
 template<>
 struct base_unit_info<us::ton_base_unit> {
-    static const char* name()   { return("short ton"); }
-    static const char* symbol() { return("t"); }
+    static BOOST_CONSTEXPR const char* name()   { return("short ton"); }
+    static BOOST_CONSTEXPR const char* symbol() { return("t"); }
 };
 
 } // namespace units