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/asio/placeholders.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/asio/placeholders.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/placeholders.hpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/3rdParty/Boost/src/boost/asio/placeholders.hpp b/3rdParty/Boost/src/boost/asio/placeholders.hpp index d4bf743..06a093f 100644 --- a/3rdParty/Boost/src/boost/asio/placeholders.hpp +++ b/3rdParty/Boost/src/boost/asio/placeholders.hpp @@ -3,5 +3,5 @@ // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2012 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2014 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -17,6 +17,8 @@ #include <boost/asio/detail/config.hpp> -#include <boost/bind/arg.hpp> -#include <boost/detail/workaround.hpp> + +#if defined(BOOST_ASIO_HAS_BOOST_BIND) +# include <boost/bind/arg.hpp> +#endif // defined(BOOST_ASIO_HAS_BOOST_BIND) #include <boost/asio/detail/push_options.hpp> @@ -48,5 +50,6 @@ unspecified iterator; unspecified signal_number; -#elif defined(__BORLANDC__) || defined(__GNUC__) +#elif defined(BOOST_ASIO_HAS_BOOST_BIND) +# if defined(__BORLANDC__) || defined(__GNUC__) inline boost::arg<1> error() @@ -70,5 +73,5 @@ inline boost::arg<2> signal_number() } -#else +# else namespace detail @@ -85,5 +88,5 @@ namespace detail } -#if BOOST_WORKAROUND(BOOST_MSVC, < 1400) +# if defined(BOOST_ASIO_MSVC) && (BOOST_ASIO_MSVC < 1400) static boost::arg<1>& error @@ -96,5 +99,5 @@ static boost::arg<2>& signal_number = boost::asio::placeholders::detail::placeholder<2>::get(); -#else +# else namespace @@ -110,6 +113,6 @@ namespace } // namespace -#endif - +# endif +# endif #endif |