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/phoenix/support | |
| 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/phoenix/support')
3 files changed, 134 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/support/detail/iterate.hpp b/3rdParty/Boost/src/boost/phoenix/support/detail/iterate.hpp new file mode 100644 index 0000000..3effb9f --- /dev/null +++ b/3rdParty/Boost/src/boost/phoenix/support/detail/iterate.hpp @@ -0,0 +1,89 @@ +/*============================================================================== + Copyright (c) 2010 Thomas Heller + + 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) +==============================================================================*/ + +#if !BOOST_PP_IS_ITERATING + +#include <boost/preprocessor/tuple/elem.hpp> + +#ifndef BOOST_PHOENIX_ITERATION_PARAMS +#error "BOOST_PHOENIX_ITERATION_PARAMS not defined" +#endif + +#define BOOST_PHOENIX_ITERATION_PARAMS_SIZE \ + BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PHOENIX_ITERATION_PARAMS) \ +/**/ + +#define BOOST_PHOENIX_ITERATION_TUPLE \ + BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PHOENIX_ITERATION_PARAMS) \ +/**/ + +#define BOOST_PHOENIX_ITERATION_START \ + BOOST_PP_TUPLE_ELEM( \ + BOOST_PHOENIX_ITERATION_PARAMS_SIZE, 0, BOOST_PHOENIX_ITERATION_TUPLE) \ +/**/ + +#define BOOST_PHOENIX_ITERATION_END \ + BOOST_PP_TUPLE_ELEM( \ + BOOST_PHOENIX_ITERATION_PARAMS_SIZE, 1, BOOST_PHOENIX_ITERATION_TUPLE) \ +/**/ + + +#define BOOST_PHOENIX_ITERATION_FILE() \ + BOOST_PP_TUPLE_ELEM( \ + BOOST_PHOENIX_ITERATION_PARAMS_SIZE, 2, BOOST_PHOENIX_ITERATION_TUPLE) \ +/**/ + +#if BOOST_PHOENIX_ITERATION_PARAMS_SIZE == 3 + +#define BOOST_PP_ITERATION_PARAMS_1 \ + (3, (BOOST_PHOENIX_ITERATION_START, BOOST_PHOENIX_ITERATION_END, \ + <boost/phoenix/support/detail/iterate.hpp>)) \ +/**/ + +#else + +#define BOOST_PHOENIX_ITERATION_FLAG \ + BOOST_PP_TUPLE_ELEM( \ + BOOST_PHOENIX_ITERATION_PARAMS_SIZE, 3, BOOST_PHOENIX_ITERATION_TUPLE) \ +/**/ + +#define BOOST_PP_ITERATION_PARAMS_1 \ + (4, (BOOST_PHOENIX_ITERATION_START, BOOST_PHOENIX_ITERATION_END, \ + <boost/phoenix/support/detail/iterate.hpp>, \ + BOOST_PHOENIX_ITERATION_FLAG)) \ +/**/ + +#endif + +#include BOOST_PP_ITERATE() + +#undef BOOST_PHOENIX_ITERATION_PARAMS_SIZE +#undef BOOST_PHOENIX_ITERATION_TUPLE +#undef BOOST_PHOENIX_ITERATION_START +#undef BOOST_PHOENIX_ITERATION_END +#undef BOOST_PHOENIX_ITERATION_PARAMS + +#else + +#undef BOOST_PHOENIX_IS_ITERATING +#define BOOST_PHOENIX_IS_ITERATING 1 + +#include <boost/phoenix/support/detail/iterate_undef.hpp> +#include <boost/phoenix/support/detail/iterate_define.hpp> + + +#include BOOST_PHOENIX_ITERATION_FILE() + +#undef BOOST_PHOENIX_ITERATION + +#undef BOOST_PHOENIX_IS_ITERATING +#define BOOST_PHOENIX_IS_ITERATING 0 + +#include <boost/phoenix/support/detail/iterate_undef.hpp> +#include <boost/phoenix/support/detail/iterate_define.hpp> + +#endif diff --git a/3rdParty/Boost/src/boost/phoenix/support/detail/iterate_undef.hpp b/3rdParty/Boost/src/boost/phoenix/support/detail/iterate_undef.hpp new file mode 100644 index 0000000..9fd1a5f --- /dev/null +++ b/3rdParty/Boost/src/boost/phoenix/support/detail/iterate_undef.hpp @@ -0,0 +1,35 @@ +/*============================================================================== + Copyright (c) 2010 Thomas Heller + + 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) +==============================================================================*/ + +#undef BOOST_PHOENIX_typename_A +#undef BOOST_PHOENIX_typename_A_void +#undef BOOST_PHOENIX_A +#undef BOOST_PHOENIX_A_a +#undef BOOST_PHOENIX_A_ref +#undef BOOST_PHOENIX_A_const_ref +#undef BOOST_PHOENIX_A_ref_a +#undef BOOST_PHOENIX_A_const_ref_a +#undef BOOST_PHOENIX_a + +#if BOOST_PHOENIX_IS_ITERATING + +#undef PHEONIX_ITERATION +#undef BOOST_PHOENIX_PERM_A +#undef BOOST_PHOENIX_PERM_A_a + +#undef BOOST_PHOENIX_M0_R +#undef BOOST_PHOENIX_M0 +#undef BOOST_PHOENIX_M1_R_R +#undef BOOST_PHOENIX_M1_R +#undef BOOST_PHOENIX_M1 +#undef BOOST_PHOENIX_M2 +#undef BOOST_PHOENIX_M3 +#undef BOOST_PHOENIX_PERM_SEQ +#undef BOOST_PHOENIX_PERM_SIZE +#undef BOOST_PHOENIX_PERM_ELEM + +#endif diff --git a/3rdParty/Boost/src/boost/phoenix/support/vector.hpp b/3rdParty/Boost/src/boost/phoenix/support/vector.hpp index 82ec6af..6899d85 100644 --- a/3rdParty/Boost/src/boost/phoenix/support/vector.hpp +++ b/3rdParty/Boost/src/boost/phoenix/support/vector.hpp @@ -1,3 +1,9 @@ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4512) // assignment operator could not be generated +#pragma warning(disable: 4510) // default constructor could not be generated +#pragma warning(disable: 4610) // can never be instantiated - user defined constructor required +#endif #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES) #ifndef BOOST_PHOENIX_SUPPORT_VECTOR_HPP @@ -132,3 +138,7 @@ BOOST_FUSION_ADAPT_TPL_STRUCT_NO_PARTIAL( #endif #endif + +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif |