import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/winapi/condition_variable.hpp b/ceph/src/boost/boost/winapi/condition_variable.hpp
index 38b7052e21c0d3b53edb8eed8fc7aa65963d0d3c..2d9d8d3241e2707bf52ed6075a9b11930f351a6d 100644 (file)
--- a/ceph/src/boost/boost/winapi/condition_variable.hpp
+++ b/ceph/src/boost/boost/winapi/condition_variable.hpp
@@ -25,22 +25,22 @@ struct _RTL_CONDITION_VARIABLE;
 struct _RTL_CRITICAL_SECTION;
 struct _RTL_SRWLOCK;
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_SYMBOL_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 InitializeConditionVariable(::_RTL_CONDITION_VARIABLE* ConditionVariable);
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_SYMBOL_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 WakeConditionVariable(::_RTL_CONDITION_VARIABLE* ConditionVariable);
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_SYMBOL_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 WakeAllConditionVariable(::_RTL_CONDITION_VARIABLE* ConditionVariable);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 SleepConditionVariableCS(
     ::_RTL_CONDITION_VARIABLE* ConditionVariable,
     ::_RTL_CRITICAL_SECTION* CriticalSection,
     boost::winapi::DWORD_ dwMilliseconds);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 SleepConditionVariableSRW(
     ::_RTL_CONDITION_VARIABLE* ConditionVariable,
     ::_RTL_SRWLOCK* SRWLock,
@@ -105,12 +105,12 @@ BOOST_FORCEINLINE BOOL_ SleepConditionVariableSRW(
 }
 
 #if defined( BOOST_USE_WINDOWS_H )
-const ULONG_ CONDITION_VARIABLE_LOCKMODE_SHARED_ = CONDITION_VARIABLE_LOCKMODE_SHARED;
+BOOST_CONSTEXPR_OR_CONST ULONG_ CONDITION_VARIABLE_LOCKMODE_SHARED_ = CONDITION_VARIABLE_LOCKMODE_SHARED;
 #else // defined( BOOST_USE_WINDOWS_H )
-const ULONG_ CONDITION_VARIABLE_LOCKMODE_SHARED_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST ULONG_ CONDITION_VARIABLE_LOCKMODE_SHARED_ = 0x00000001;
 #endif // defined( BOOST_USE_WINDOWS_H )
 
-const ULONG_ condition_variable_lockmode_shared = CONDITION_VARIABLE_LOCKMODE_SHARED_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ condition_variable_lockmode_shared = CONDITION_VARIABLE_LOCKMODE_SHARED_;
 
 }
 }