9 files changed, 18 insertions, 18 deletions
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"); }
 };
 
 }