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/exceptions.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/exceptions.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/thread/exceptions.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/boost/thread/exceptions.hpp b/3rdParty/Boost/src/boost/thread/exceptions.hpp index 08c28d3..d97465b 100644 --- a/3rdParty/Boost/src/boost/thread/exceptions.hpp +++ b/3rdParty/Boost/src/boost/thread/exceptions.hpp @@ -1,67 +1,69 @@ // Copyright (C) 2001-2003 // William E. Kempf // Copyright (C) 2007-9 Anthony Williams // (C) Copyright 2011-2012 Vicente J. Botet Escriba // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #ifndef BOOST_THREAD_EXCEPTIONS_PDM070801_H #define BOOST_THREAD_EXCEPTIONS_PDM070801_H #include <boost/thread/detail/config.hpp> // pdm: Sorry, but this class is used all over the place & I end up // with recursive headers if I don't separate it // wek: Not sure why recursive headers would cause compilation problems // given the include guards, but regardless it makes sense to // seperate this out any way. #include <string> #include <stdexcept> #include <boost/system/system_error.hpp> #include <boost/system/error_code.hpp> #include <boost/config/abi_prefix.hpp> namespace boost { +#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS class BOOST_SYMBOL_VISIBLE thread_interrupted {}; +#endif class BOOST_SYMBOL_VISIBLE thread_exception: public system::system_error //public std::exception { typedef system::system_error base_type; public: thread_exception() : base_type(0,system::system_category()) {} thread_exception(int sys_error_code) : base_type(sys_error_code, system::system_category()) {} thread_exception( int ev, const char * what_arg ) : base_type(system::error_code(ev, system::system_category()), what_arg) { } thread_exception( int ev, const std::string & what_arg ) : base_type(system::error_code(ev, system::system_category()), what_arg) { } ~thread_exception() throw() {} int native_error() const { return code().value(); } }; @@ -90,134 +92,134 @@ namespace boost class BOOST_SYMBOL_VISIBLE lock_error: public thread_exception { typedef thread_exception base_type; public: lock_error() : base_type(0, "boost::lock_error") {} lock_error( int ev ) : base_type(ev, "boost::lock_error") { } lock_error( int ev, const char * what_arg ) : base_type(ev, what_arg) { } lock_error( int ev, const std::string & what_arg ) : base_type(ev, what_arg) { } ~lock_error() throw() {} }; class BOOST_SYMBOL_VISIBLE thread_resource_error: public thread_exception { typedef thread_exception base_type; public: thread_resource_error() - : base_type(system::errc::resource_unavailable_try_again, "boost::thread_resource_error") + : base_type(static_cast<int>(system::errc::resource_unavailable_try_again), "boost::thread_resource_error") {} thread_resource_error( int ev ) : base_type(ev, "boost::thread_resource_error") { } thread_resource_error( int ev, const char * what_arg ) : base_type(ev, what_arg) { } thread_resource_error( int ev, const std::string & what_arg ) : base_type(ev, what_arg) { } ~thread_resource_error() throw() {} }; class BOOST_SYMBOL_VISIBLE unsupported_thread_option: public thread_exception { typedef thread_exception base_type; public: unsupported_thread_option() - : base_type(system::errc::invalid_argument, "boost::unsupported_thread_option") + : base_type(static_cast<int>(system::errc::invalid_argument), "boost::unsupported_thread_option") {} unsupported_thread_option( int ev ) : base_type(ev, "boost::unsupported_thread_option") { } unsupported_thread_option( int ev, const char * what_arg ) : base_type(ev, what_arg) { } unsupported_thread_option( int ev, const std::string & what_arg ) : base_type(ev, what_arg) { } }; class BOOST_SYMBOL_VISIBLE invalid_thread_argument: public thread_exception { typedef thread_exception base_type; public: invalid_thread_argument() - : base_type(system::errc::invalid_argument, "boost::invalid_thread_argument") + : base_type(static_cast<int>(system::errc::invalid_argument), "boost::invalid_thread_argument") {} invalid_thread_argument( int ev ) : base_type(ev, "boost::invalid_thread_argument") { } invalid_thread_argument( int ev, const char * what_arg ) : base_type(ev, what_arg) { } invalid_thread_argument( int ev, const std::string & what_arg ) : base_type(ev, what_arg) { } }; class BOOST_SYMBOL_VISIBLE thread_permission_error: public thread_exception { typedef thread_exception base_type; public: thread_permission_error() - : base_type(system::errc::permission_denied, "boost::thread_permission_error") + : base_type(static_cast<int>(system::errc::permission_denied), "boost::thread_permission_error") {} thread_permission_error( int ev ) : base_type(ev, "boost::thread_permission_error") { } thread_permission_error( int ev, const char * what_arg ) : base_type(ev, what_arg) { } thread_permission_error( int ev, const std::string & what_arg ) : base_type(ev, what_arg) { } }; } // namespace boost #include <boost/config/abi_suffix.hpp> #endif |