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/fusion/container/deque | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-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/fusion/container/deque')
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/deque_fwd.hpp | 23 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp (renamed from 3rdParty/Boost/src/boost/fusion/container/deque/detail/pp_deque_fwd.hpp) | 6 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/limits.hpp (renamed from 3rdParty/Boost/src/boost/fusion/container/deque/limits.hpp) | 0 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10_fwd.hpp (renamed from 3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque10_fwd.hpp) | 0 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20_fwd.hpp (renamed from 3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque20_fwd.hpp) | 0 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30_fwd.hpp (renamed from 3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque30_fwd.hpp) | 0 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40_fwd.hpp (renamed from 3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque40_fwd.hpp) | 0 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50_fwd.hpp (renamed from 3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque50_fwd.hpp) | 0 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_fwd.hpp (renamed from 3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque_fwd.hpp) | 10 |
9 files changed, 24 insertions, 15 deletions
diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/deque_fwd.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/deque_fwd.hpp index fc1f9cb..639c00e 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/deque_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/deque_fwd.hpp @@ -8,19 +8,28 @@ #if !defined(FUSION_DEQUE_FORWARD_02092007_0749) #define FUSION_DEQUE_FORWARD_02092007_0749 +#include <boost/fusion/support/config.hpp> #include <boost/config.hpp> -/////////////////////////////////////////////////////////////////////////////// -// With no decltype and variadics, we will use the C++03 version -/////////////////////////////////////////////////////////////////////////////// -#if (defined(BOOST_NO_DECLTYPE) \ - || defined(BOOST_NO_VARIADIC_TEMPLATES) \ - || defined(BOOST_NO_RVALUE_REFERENCES)) -# include <boost/fusion/container/deque/detail/pp_deque_fwd.hpp> +#if (defined(BOOST_NO_CXX11_DECLTYPE) \ + || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) \ + || defined(BOOST_NO_CXX11_RVALUE_REFERENCES)) \ + || (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)) +# if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE) +# undef BOOST_FUSION_HAS_VARIADIC_DEQUE +# endif #else # if !defined(BOOST_FUSION_HAS_VARIADIC_DEQUE) # define BOOST_FUSION_HAS_VARIADIC_DEQUE # endif +#endif + +/////////////////////////////////////////////////////////////////////////////// +// With no decltype and variadics, we will use the C++03 version +/////////////////////////////////////////////////////////////////////////////// +#if !defined(BOOST_FUSION_HAS_VARIADIC_DEQUE) +# include <boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp> +#else /////////////////////////////////////////////////////////////////////////////// // C++11 interface diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/detail/pp_deque_fwd.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp index 354cfcc..0da8bd2 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/detail/pp_deque_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp @@ -12,14 +12,14 @@ #error "C++03 only! This file should not have been included" #endif -#include <boost/fusion/container/deque/limits.hpp> +#include <boost/fusion/container/deque/detail/cpp03/limits.hpp> #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp> #if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES) -#include <boost/fusion/container/deque/detail/preprocessed/deque_fwd.hpp> +#include <boost/fusion/container/deque/detail/cpp03/preprocessed/deque_fwd.hpp> #else #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES) -#pragma wave option(preserve: 2, line: 0, output: "detail/preprocessed/deque" FUSION_MAX_DEQUE_SIZE_STR "_fwd.hpp") +#pragma wave option(preserve: 2, line: 0, output: "preprocessed/deque" FUSION_MAX_DEQUE_SIZE_STR "_fwd.hpp") #endif /*============================================================================= diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/limits.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/limits.hpp index 7892ba1..7892ba1 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/limits.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/limits.hpp diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque10_fwd.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10_fwd.hpp index 4752e96..4752e96 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque10_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10_fwd.hpp diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque20_fwd.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20_fwd.hpp index c536188..c536188 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque20_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20_fwd.hpp diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque30_fwd.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30_fwd.hpp index d7abffc..d7abffc 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque30_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30_fwd.hpp diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque40_fwd.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40_fwd.hpp index 72f2b9c..72f2b9c 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque40_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40_fwd.hpp diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque50_fwd.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50_fwd.hpp index d46a2c7..d46a2c7 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque50_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50_fwd.hpp diff --git a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque_fwd.hpp b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_fwd.hpp index a0b75b7..9a770b9 100644 --- a/3rdParty/Boost/src/boost/fusion/container/deque/detail/preprocessed/deque_fwd.hpp +++ b/3rdParty/Boost/src/boost/fusion/container/deque/detail/cpp03/preprocessed/deque_fwd.hpp @@ -8,15 +8,15 @@ ==============================================================================*/ #if FUSION_MAX_DEQUE_SIZE <= 10 -#include <boost/fusion/container/deque/detail/preprocessed/deque10_fwd.hpp> +#include <boost/fusion/container/deque/detail/cpp03/preprocessed/deque10_fwd.hpp> #elif FUSION_MAX_DEQUE_SIZE <= 20 -#include <boost/fusion/container/deque/detail/preprocessed/deque20_fwd.hpp> +#include <boost/fusion/container/deque/detail/cpp03/preprocessed/deque20_fwd.hpp> #elif FUSION_MAX_DEQUE_SIZE <= 30 -#include <boost/fusion/container/deque/detail/preprocessed/deque30_fwd.hpp> +#include <boost/fusion/container/deque/detail/cpp03/preprocessed/deque30_fwd.hpp> #elif FUSION_MAX_DEQUE_SIZE <= 40 -#include <boost/fusion/container/deque/detail/preprocessed/deque40_fwd.hpp> +#include <boost/fusion/container/deque/detail/cpp03/preprocessed/deque40_fwd.hpp> #elif FUSION_MAX_DEQUE_SIZE <= 50 -#include <boost/fusion/container/deque/detail/preprocessed/deque50_fwd.hpp> +#include <boost/fusion/container/deque/detail/cpp03/preprocessed/deque50_fwd.hpp> #else #error "FUSION_MAX_DEQUE_SIZE out of bounds for preprocessed headers" #endif |