Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/thread/once.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/thread/once.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/thread/once.hpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/thread/once.hpp b/3rdParty/Boost/src/boost/thread/once.hpp index acd216e..9fcfb53 100644 --- a/3rdParty/Boost/src/boost/thread/once.hpp +++ b/3rdParty/Boost/src/boost/thread/once.hpp @@ -10,9 +10,16 @@ // http://www.boost.org/LICENSE_1_0.txt) +#include <boost/thread/detail/config.hpp> #include <boost/thread/detail/platform.hpp> #if defined(BOOST_THREAD_PLATFORM_WIN32) #include <boost/thread/win32/once.hpp> #elif defined(BOOST_THREAD_PLATFORM_PTHREAD) +#if defined BOOST_THREAD_ONCE_FAST_EPOCH #include <boost/thread/pthread/once.hpp> +#elif defined BOOST_THREAD_ONCE_ATOMIC +#include <boost/thread/pthread/once_atomic.hpp> +#else +#error "Once Not Implemented" +#endif #else #error "Boost threads unavailable on this platform" @@ -25,5 +32,7 @@ namespace boost // template<class Callable, class ...Args> void // call_once(once_flag& flag, Callable&& func, Args&&... args); - inline void call_once(void (*func)(),once_flag& flag) +template<typename Function> +inline void call_once(Function func,once_flag& flag) +//inline void call_once(void (*func)(),once_flag& flag) { call_once(flag,func); |