Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/thread/win32/once.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/thread/win32/once.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/thread/win32/once.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -18,7 +18,7 @@ #include <boost/detail/interlocked.hpp> #include <boost/thread/win32/thread_primitives.hpp> #include <boost/thread/win32/interlocked_read.hpp> -#include <boost/detail/no_exceptions_support.hpp> +#include <boost/core/no_exceptions_support.hpp> #include <boost/thread/detail/move.hpp> #include <boost/thread/detail/invoke.hpp> @@ -152,14 +152,11 @@ { name_once_mutex(mutex_name,flag_address); } -#ifdef BOOST_NO_ANSI_APIS - return ::boost::detail::win32::CreateEventW( -#else - return ::boost::detail::win32::CreateEventA( -#endif - 0,::boost::detail::win32::manual_reset_event, - ::boost::detail::win32::event_initially_reset, - mutex_name); + + return ::boost::detail::win32::create_event( + mutex_name, + ::boost::detail::win32::manual_reset_event, + ::boost::detail::win32::event_initially_reset); } struct once_context { @@ -227,7 +224,7 @@ } } -#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES +#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) //#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) inline void call_once(once_flag& flag, void (*f)()) { @@ -267,8 +264,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite, 0)); } } //#endif @@ -311,8 +308,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, class A, class ...ArgTypes> @@ -358,8 +355,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } #else @@ -403,8 +400,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1> @@ -446,8 +443,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1, typename T2> @@ -489,8 +486,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1, typename T2, typename T3> @@ -532,8 +529,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } #elif defined BOOST_NO_CXX11_RVALUE_REFERENCES @@ -577,8 +574,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1> @@ -620,8 +617,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1, typename T2> @@ -663,8 +660,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1, typename T2, typename T3> @@ -706,8 +703,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } #endif @@ -751,8 +748,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename T1> @@ -796,8 +793,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1, typename T2> @@ -842,8 +839,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1, typename T2, typename T3> @@ -889,8 +886,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } #endif @@ -933,8 +930,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } @@ -980,8 +977,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1, typename T2> @@ -1027,8 +1024,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } } template<typename Function, typename T1, typename T2, typename T3> @@ -1076,8 +1073,8 @@ continue; } } - BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObject( - ctx.event_handle,::boost::detail::win32::infinite)); + BOOST_VERIFY(!::boost::detail::win32::WaitForSingleObjectEx( + ctx.event_handle,::boost::detail::win32::infinite,0)); } }