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/core.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.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/core.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/core.hpp b/3rdParty/Boost/src/boost/phoenix/core.hpp index 0eb2bc8..eb1c987 100644 --- a/3rdParty/Boost/src/boost/phoenix/core.hpp +++ b/3rdParty/Boost/src/boost/phoenix/core.hpp @@ -7,12 +7,10 @@ #ifndef BOOST_PHOENIX_CORE_HPP #define BOOST_PHOENIX_CORE_HPP -#ifdef BOOST_PHOENIX_USE_V2_OVER_V3 -#include <boost/spirit/home/phoenix/core.hpp> -#else #include <boost/phoenix/version.hpp> #include <boost/phoenix/core/limits.hpp> #include <boost/phoenix/core/actor.hpp> +#include <boost/phoenix/core/debug.hpp> #include <boost/phoenix/core/is_actor.hpp> #include <boost/phoenix/core/argument.hpp> #include <boost/phoenix/core/value.hpp> @@ -21,6 +19,7 @@ #include <boost/phoenix/core/function_equal.hpp> #include <boost/phoenix/core/visit_each.hpp> #include <boost/phoenix/core/v2_eval.hpp> -#endif +#include <boost/phoenix/scope/local_variable.hpp> // to fix 5824 +#include <boost/proto/generate.hpp> // attempt to fix problems in intel 14.0.1 #endif |