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/bind/detail/member_function_ptr.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/bind/detail/member_function_ptr.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/bind/detail/member_function_ptr.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/bind/detail/member_function_ptr.hpp b/3rdParty/Boost/src/boost/phoenix/bind/detail/member_function_ptr.hpp index aa40d13..7854dfc 100644 --- a/3rdParty/Boost/src/boost/phoenix/bind/detail/member_function_ptr.hpp +++ b/3rdParty/Boost/src/boost/phoenix/bind/detail/member_function_ptr.hpp @@ -28,8 +28,8 @@ namespace boost { namespace phoenix { namespace detail { typedef typename member_function_ptr_impl<N>:: template impl<RT, FP> base; - member_function_ptr(FP fp) - : base(fp) {} + member_function_ptr(FP fp_) + : base(fp_) {} using base::fp; @@ -39,7 +39,7 @@ namespace boost { namespace phoenix { namespace detail } template <int M, typename RhsRT, typename RhsFP> - bool operator==(member_function_ptr<M, RhsRT, RhsFP> const & rhs) const + bool operator==(member_function_ptr<M, RhsRT, RhsFP> const &) const { return false; } @@ -53,8 +53,8 @@ namespace boost { namespace phoenix { namespace detail { typedef RT result_type; - impl(FP fp) - : fp(fp) {} + impl(FP fp_) + : fp(fp_) {} template <typename Class> RT operator()(Class& obj) const @@ -124,8 +124,8 @@ namespace boost { namespace phoenix { namespace detail { typedef RT result_type; - impl(FP fp) - : fp(fp) {} + impl(FP fp_) + : fp(fp_) {} template <typename Class, BOOST_PHOENIX_typename_A> RT operator()(Class& obj, BOOST_PHOENIX_A_ref_a) const |