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/operator/detail | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-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/operator/detail')
7 files changed, 22 insertions, 20 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/define_operator.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/define_operator.hpp index cc35f1a..3de63b8 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/define_operator.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/define_operator.hpp @@ -44,8 +44,9 @@ {}; \ } \ template <typename Operand> \ + inline \ typename result_of::BOOST_PP_CAT(make_, name)<Operand>::type \ - inline BOOST_PP_CAT(make_, name)(Operand const & operand) \ + BOOST_PP_CAT(make_, name)(Operand const & operand) \ { \ return functional::BOOST_PP_CAT(make_, name)()(operand); \ } \ @@ -83,8 +84,9 @@ {}; \ } \ template <typename Rhs, typename Lhs> \ + inline \ typename result_of::BOOST_PP_CAT(make_, name)<Rhs, Lhs>::type \ - inline BOOST_PP_CAT(make_, name)(Lhs const & lhs, Rhs const & rhs) \ + BOOST_PP_CAT(make_, name)(Lhs const & lhs, Rhs const & rhs) \ { \ return functional::BOOST_PP_CAT(make_, name)()(lhs, rhs); \ } \ diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp index 59f5d5c..59a5223 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp @@ -43,9 +43,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_10.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_10.hpp index 2b6ccae..0e2e305 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_10.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_10.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_20.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_20.hpp index ac4621a..b5a8368 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_20.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_20.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_30.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_30.hpp index 8e0fba4..a715947 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_30.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_30.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_40.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_40.hpp index a61836e..c11e486 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_40.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_40.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_50.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_50.hpp index d93a324..8e0f536 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_50.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_50.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const |