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/value.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/value.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/core/value.hpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/core/value.hpp b/3rdParty/Boost/src/boost/phoenix/core/value.hpp index 59cc369..bb381e9 100644 --- a/3rdParty/Boost/src/boost/phoenix/core/value.hpp +++ b/3rdParty/Boost/src/boost/phoenix/core/value.hpp @@ -29,12 +29,24 @@ namespace boost { namespace phoenix template <typename T> struct value : expression::terminal<T> - {}; + { + typedef + typename expression::terminal<T>::type + type; + /* + static const type make(T & t) + { + typename value<T>::type const e = {{t}}; + return e; + } + */ + }; } template <typename T> + inline typename expression::value<T>::type const - inline val(T t) + val(T t) { return expression::value<T>::make(t); } @@ -55,11 +67,11 @@ namespace boost { namespace phoenix template <typename This, typename Actor, typename Context> struct result<This(Actor, Context)> : boost::remove_const< - typename boost::remove_reference< + typename boost::remove_reference< typename evaluator::impl<Actor, Context, proto::empty_env>::result_type - >::type - > - {}; + >::type + > + {}; template <typename Context> typename result<custom_terminal(actor<Expr> const &, Context &)>::type |