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/terminal.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/terminal.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/core/terminal.hpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/core/terminal.hpp b/3rdParty/Boost/src/boost/phoenix/core/terminal.hpp index 79ebe64..f161393 100644 --- a/3rdParty/Boost/src/boost/phoenix/core/terminal.hpp +++ b/3rdParty/Boost/src/boost/phoenix/core/terminal.hpp @@ -49,6 +49,10 @@ namespace boost { namespace phoenix template <typename T, typename Dummy> struct custom_terminal; + + namespace tag { + struct terminal /*: public proto::tag::terminal */ {}; + } namespace expression { @@ -60,7 +64,8 @@ namespace boost { namespace phoenix { typedef proto::basic_expr< - proto::tag::terminal + proto::tag::terminal + // tag::terminal //cannot change to use phoenix tag - breaks code. , proto::term<T> , 0 > @@ -69,7 +74,9 @@ namespace boost { namespace phoenix static const type make(typename call_traits<T>::param_type t) { + // ?? Should the next line be Actor not actor which is the default? actor<base_type> const e = {base_type::make(t)}; + //Actor<base_type> const e = {base_type::make(t)}; return e; } }; |