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/assign | |
| 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/assign')
| -rw-r--r-- | 3rdParty/Boost/src/boost/assign/assignment_exception.hpp | 2 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/assign/list_of.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/assign/assignment_exception.hpp b/3rdParty/Boost/src/boost/assign/assignment_exception.hpp index 5079c3a..96ea417 100644 --- a/3rdParty/Boost/src/boost/assign/assignment_exception.hpp +++ b/3rdParty/Boost/src/boost/assign/assignment_exception.hpp @@ -1,43 +1,43 @@ // Boost.Assign library // // Copyright Thorsten Ottosen 2003-2004. Use, modification and // distribution is subject to 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) // // For more information, see http://www.boost.org/libs/assign/ // #ifndef BOOST_ASSIGN_ASSIGNMENT_EXCEPTION_HPP #define BOOST_ASSIGN_ASSIGNMENT_EXCEPTION_HPP -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif #include <exception> namespace boost { namespace assign { class assignment_exception : public std::exception { public: assignment_exception( const char* _what ) : what_( _what ) { } virtual const char* what() const throw() { return what_; } private: const char* what_; }; } } #endif diff --git a/3rdParty/Boost/src/boost/assign/list_of.hpp b/3rdParty/Boost/src/boost/assign/list_of.hpp index 6da444b..5b995fd 100644 --- a/3rdParty/Boost/src/boost/assign/list_of.hpp +++ b/3rdParty/Boost/src/boost/assign/list_of.hpp @@ -1,50 +1,50 @@ // Boost.Assign library // // Copyright Thorsten Ottosen 2003-2004. Use, modification and // distribution is subject to 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) // // For more information, see http://www.boost.org/libs/assign/ // #ifndef BOOST_ASSIGN_LIST_OF_HPP #define BOOST_ASSIGN_LIST_OF_HPP -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif #include <boost/assign/assignment_exception.hpp> #include <boost/range/iterator_range.hpp> #include <boost/config.hpp> #include <boost/tuple/tuple.hpp> #include <boost/type_traits/remove_const.hpp> #include <boost/type_traits/remove_reference.hpp> #include <boost/type_traits/is_reference.hpp> #include <boost/static_assert.hpp> #include <boost/type_traits/detail/yes_no_type.hpp> #include <boost/type_traits/decay.hpp> #include <boost/type_traits/is_array.hpp> #include <boost/mpl/if.hpp> #include <deque> #include <cstddef> #include <utility> #include <boost/preprocessor/repetition/enum_binary_params.hpp> #include <boost/preprocessor/repetition/enum_params.hpp> #include <boost/preprocessor/iteration/local.hpp> #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) // BCB requires full type definition for is_array<> to work correctly. #include <boost/array.hpp> #endif namespace boost { // this here is necessary to avoid compiler error in <boost/array.hpp> #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) template< class T, std::size_t sz > class array; |