update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / winapi / error_handling.hpp

diff --git a/ceph/src/boost/boost/winapi/error_handling.hpp b/ceph/src/boost/boost/winapi/error_handling.hpp
index fef1b6e86d5c8b4d65507d8053ea8f1890ab875c..ee157a65036731973db577e6dd61e05364db49ac 100644 (file)
--- a/ceph/src/boost/boost/winapi/error_handling.hpp
+++ b/ceph/src/boost/boost/winapi/error_handling.hpp
@@ -73,7 +73,7 @@ BOOST_CONSTEXPR_OR_CONST WORD_ SUBLANG_DEFAULT_=               SUBLANG_DEFAULT;
 
 BOOST_FORCEINLINE BOOST_CONSTEXPR WORD_ MAKELANGID_(WORD_ p, WORD_ s) BOOST_NOEXCEPT
 {
-    return MAKELANGID(p,s);
+    return static_cast< WORD_ >(MAKELANGID(p, s));
 }
 
 #if BOOST_WINAPI_PARTITION_DESKTOP
@@ -102,7 +102,7 @@ BOOST_CONSTEXPR_OR_CONST WORD_ SUBLANG_DEFAULT_=               0x01;    // user
 
 BOOST_FORCEINLINE BOOST_CONSTEXPR WORD_ MAKELANGID_(WORD_ p, WORD_ s) BOOST_NOEXCEPT
 {
-    return (WORD_)((((WORD_)(s)) << 10) | (WORD_)(p));
+    return static_cast< WORD_ >((static_cast< DWORD_ >(s) << 10u) | p);
 }
 
 #if BOOST_WINAPI_PARTITION_DESKTOP