18 files changed, 36 insertions, 36 deletions
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