diff 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/core/detail/expression.hpp | |
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/core/detail/expression.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/core/detail/expression.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/core/detail/expression.hpp b/3rdParty/Boost/src/boost/phoenix/core/detail/expression.hpp index 7b239b1..8ec6ce2 100644 --- a/3rdParty/Boost/src/boost/phoenix/core/detail/expression.hpp +++ b/3rdParty/Boost/src/boost/phoenix/core/detail/expression.hpp @@ -190,6 +190,7 @@ namespace boost { namespace phoenix #define BOOST_PHOENIX_DEFINE_EXPRESSION_MAKE_EXPRESSION_DEFAULT(NAME_SEQ, GRAMMAR_SEQ, D) \ template <BOOST_PHOENIX_typename_A(BOOST_PP_SEQ_SIZE(GRAMMAR_SEQ))> \ + inline \ typename \ result_of::BOOST_PP_CAT( \ make_ \ @@ -197,7 +198,7 @@ namespace boost { namespace phoenix )< \ BOOST_PHOENIX_A(BOOST_PP_SEQ_SIZE(GRAMMAR_SEQ)) \ >::type const \ - inline BOOST_PP_CAT( \ + BOOST_PP_CAT( \ make_ \ , BOOST_PP_SEQ_HEAD(BOOST_PP_SEQ_REVERSE(NAME_SEQ)) \ )( \ @@ -309,11 +310,12 @@ namespace boost { namespace phoenix #define BOOST_PHOENIX_DEFINE_EXPRESSION_MAKE_EXPRESSION_VARARG_R(Z, N, NAME) \ template <BOOST_PHOENIX_typename_A(N)> \ + inline \ typename \ result_of:: BOOST_PP_CAT(make_, NAME)< \ BOOST_PHOENIX_A(N) \ >::type \ - inline BOOST_PP_CAT(make_, NAME)(BOOST_PHOENIX_A_const_ref_a(N)) \ + BOOST_PP_CAT(make_, NAME)(BOOST_PHOENIX_A_const_ref_a(N)) \ { \ return functional::BOOST_PP_CAT(make_, NAME)()(BOOST_PHOENIX_a(N)); \ } \ |