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/limits.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/limits.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/core/limits.hpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/core/limits.hpp b/3rdParty/Boost/src/boost/phoenix/core/limits.hpp index 46ac69e..5571ec6 100644 --- a/3rdParty/Boost/src/boost/phoenix/core/limits.hpp +++ b/3rdParty/Boost/src/boost/phoenix/core/limits.hpp @@ -16,14 +16,20 @@ #if defined(BOOST_PHOENIX_LIMIT) -#define BOOST_PROTO_MAX_ARITY BOOST_PHOENIX_LIMIT +# if !defined( BOOST_PROTO_MAX_ARITY ) +# define BOOST_PROTO_MAX_ARITY BOOST_PHOENIX_LIMIT +# elif (BOOST_PROTO_MAX_ARITY < BOOST_PHOENIX_LIMIT) +# error "BOOST_PROTO_MAX_ARITY is set too low" +# endif #include <boost/proto/proto_fwd.hpp> #else #include <boost/proto/proto_fwd.hpp> #define BOOST_PHOENIX_LIMIT BOOST_PROTO_MAX_ARITY #endif +#if !defined(PHOENIX_LIMIT) #define PHOENIX_LIMIT BOOST_PHOENIX_LIMIT +#endif #define BOOST_PHOENIX_LIMIT_STR BOOST_PP_STRINGIZE(BOOST_PHOENIX_PP_ROUND_UP(BOOST_PHOENIX_LIMIT)) |