update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / units / detail / prevent_redefinition.hpp

diff --git a/ceph/src/boost/boost/units/detail/prevent_redefinition.hpp b/ceph/src/boost/boost/units/detail/prevent_redefinition.hpp
index fba969ae38911df756cacd6f0206bcf2959511e3..1f23575370e87ff9ef1d1d6d9a1c469d3e9d0a24 100644 (file)
--- a/ceph/src/boost/boost/units/detail/prevent_redefinition.hpp
+++ b/ceph/src/boost/boost/units/detail/prevent_redefinition.hpp
@@ -19,7 +19,7 @@ namespace units {
 
 namespace detail {
 
-struct no { no() {} char dummy; };
+struct no { BOOST_CONSTEXPR no() : dummy() {} char dummy; };
 struct yes { no dummy[2]; };
 
 template<bool> struct ordinal_has_already_been_defined;
@@ -37,15 +37,17 @@ struct ordinal_has_already_been_defined<false>  { typedef void type; };
 /// be found by ADL
 /// INTERNAL ONLY
 template<class T>
+BOOST_CONSTEXPR
 detail::no 
 boost_units_is_registered(const T&) 
-{ detail::no result; return(result); }
+{ return(detail::no()); }
 
 /// INTERNAL ONLY
 template<class T>
+BOOST_CONSTEXPR
 detail::no 
 boost_units_unit_is_registered(const T&) 
-{ detail::no result; return(result); }
+{ return(detail::no()); }
 
 } // namespace units