Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/variant/detail')
| -rw-r--r-- | 3rdParty/Boost/src/boost/variant/detail/apply_visitor_delayed.hpp | 4 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/boost/variant/detail/apply_visitor_delayed.hpp b/3rdParty/Boost/src/boost/variant/detail/apply_visitor_delayed.hpp index 2650508..5f5642b 100644 --- a/3rdParty/Boost/src/boost/variant/detail/apply_visitor_delayed.hpp +++ b/3rdParty/Boost/src/boost/variant/detail/apply_visitor_delayed.hpp @@ -58,7 +58,7 @@ public: // unary visitor interface template <typename Visitable> BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(result_type) - operator()(Visitable& visitable) + operator()(Visitable& visitable) const { return apply_visitor(visitor_, visitable); } @@ -67,7 +67,7 @@ public: // binary visitor interface template <typename Visitable1, typename Visitable2> BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(result_type) - operator()(Visitable1& visitable1, Visitable2& visitable2) + operator()(Visitable1& visitable1, Visitable2& visitable2) const { return apply_visitor(visitor_, visitable1, visitable2); } diff --git a/3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp b/3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp index 0d4271a..73b33dd 100644 --- a/3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp +++ b/3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp @@ -167,7 +167,7 @@ visitation_impl_invoke( , has_nothrow_copy<T> >::type never_uses_backup; - return visitation_impl_invoke_impl( + return (visitation_impl_invoke_impl)( internal_which, visitor, storage, t , never_uses_backup() ); @@ -246,7 +246,7 @@ visitation_impl( // ...applying the appropriate case: # define BOOST_VARIANT_AUX_APPLY_VISITOR_STEP_CASE(z, N, _) \ case (Which::value + (N)): \ - return visitation_impl_invoke( \ + return (visitation_impl_invoke)( \ internal_which, visitor, storage \ , static_cast<BOOST_PP_CAT(T,N)*>(0) \ , no_backup_flag, 1L \ @@ -261,6 +261,7 @@ visitation_impl( # undef BOOST_VARIANT_AUX_APPLY_VISITOR_STEP_CASE + default: BOOST_ASSERT(!"Boost.Variant internal error: 'which' out of range."); } // If not handled in this iteration, continue unrolling: |