Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-24 20:33:19 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-24 20:35:17 (GMT) |
| commit | 332d60c56dfaa11fdd135088279d15cd5983b3d4 (patch) | |
| tree | dd77717a4e1732da929d5ff8a0471fa3f005e201 /3rdParty/Boost/src/boost/variant | |
| parent | 90c44a10fec26d2a0935b2d62e82b6a5be028373 (diff) | |
| download | swift-332d60c56dfaa11fdd135088279d15cd5983b3d4.zip swift-332d60c56dfaa11fdd135088279d15cd5983b3d4.tar.bz2 | |
Upgraded Boost to 1.45.0.
Diffstat (limited to '3rdParty/Boost/src/boost/variant')
6 files changed, 35 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/variant/detail/apply_visitor_binary.hpp b/3rdParty/Boost/src/boost/variant/detail/apply_visitor_binary.hpp index 92cdb42..f1c1fb6 100644 --- a/3rdParty/Boost/src/boost/variant/detail/apply_visitor_binary.hpp +++ b/3rdParty/Boost/src/boost/variant/detail/apply_visitor_binary.hpp @@ -19,7 +19,11 @@ #include "boost/variant/detail/apply_visitor_unary.hpp" +#if BOOST_WORKAROUND(__EDG__, BOOST_TESTED_AT(302)) #include "boost/utility/enable_if.hpp" +#include "boost/mpl/not.hpp" +#include "boost/type_traits/is_const.hpp" +#endif namespace boost { @@ -63,6 +67,9 @@ public: // visitor interfaces return visitor_(value1_, value2); } +private: + apply_visitor_binary_invoke& operator=(const apply_visitor_binary_invoke&); + }; template <typename Visitor, typename Visitable2> @@ -100,6 +107,9 @@ public: // visitor interfaces return boost::apply_visitor(invoker, visitable2_); } +private: + apply_visitor_binary_unwrap& operator=(const apply_visitor_binary_unwrap&); + }; }} // namespace detail::variant 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 31c79a2..2650508 100644 --- a/3rdParty/Boost/src/boost/variant/detail/apply_visitor_delayed.hpp +++ b/3rdParty/Boost/src/boost/variant/detail/apply_visitor_delayed.hpp @@ -72,6 +72,9 @@ public: // binary visitor interface return apply_visitor(visitor_, visitable1, visitable2); } +private: + apply_visitor_delayed_t& operator=(const apply_visitor_delayed_t&); + }; template <typename Visitor> diff --git a/3rdParty/Boost/src/boost/variant/detail/apply_visitor_unary.hpp b/3rdParty/Boost/src/boost/variant/detail/apply_visitor_unary.hpp index 10b361a..64199d8 100644 --- a/3rdParty/Boost/src/boost/variant/detail/apply_visitor_unary.hpp +++ b/3rdParty/Boost/src/boost/variant/detail/apply_visitor_unary.hpp @@ -17,7 +17,11 @@ #include "boost/detail/workaround.hpp" #include "boost/variant/detail/generic_result_type.hpp" +#if BOOST_WORKAROUND(__EDG__, BOOST_TESTED_AT(302)) #include "boost/utility/enable_if.hpp" +#include "boost/mpl/not.hpp" +#include "boost/type_traits/is_const.hpp" +#endif namespace boost { diff --git a/3rdParty/Boost/src/boost/variant/detail/variant_io.hpp b/3rdParty/Boost/src/boost/variant/detail/variant_io.hpp index c72491a..192a3de 100644 --- a/3rdParty/Boost/src/boost/variant/detail/variant_io.hpp +++ b/3rdParty/Boost/src/boost/variant/detail/variant_io.hpp @@ -64,6 +64,9 @@ public: // visitor interface out_ << operand; } +private: + printer& operator=(const printer&); + }; }} // namespace detail::variant diff --git a/3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp b/3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp index 36ab906..0d4271a 100644 --- a/3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp +++ b/3rdParty/Boost/src/boost/variant/detail/visitation_impl.hpp @@ -35,6 +35,10 @@ #include "boost/type_traits/has_nothrow_copy.hpp" #include "boost/variant/detail/has_nothrow_move.hpp" +#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) +# pragma warning (push) +# pragma warning (disable : 4702) //unreachable code +#endif /////////////////////////////////////////////////////////////////////////////// // BOOST_VARIANT_VISITATION_UNROLLING_LIMIT @@ -283,4 +287,8 @@ visitation_impl( }} // namespace detail::variant } // namespace boost +#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) +# pragma warning(pop) +#endif + #endif // BOOST_VARIANT_DETAIL_VISITATION_IMPL_HPP diff --git a/3rdParty/Boost/src/boost/variant/variant.hpp b/3rdParty/Boost/src/boost/variant/variant.hpp index 7e3c9e8..205ad8d 100644 --- a/3rdParty/Boost/src/boost/variant/variant.hpp +++ b/3rdParty/Boost/src/boost/variant/variant.hpp @@ -56,6 +56,7 @@ #include "boost/mpl/eval_if.hpp" #include "boost/mpl/begin_end.hpp" #include "boost/mpl/bool.hpp" +#include "boost/mpl/not.hpp" #include "boost/mpl/empty.hpp" #include "boost/mpl/find_if.hpp" #include "boost/mpl/front.hpp" @@ -698,6 +699,9 @@ public: // internal visitor interfaces ::boost::detail::variant::move_swap( operand, other ); } +private: + swap_with& operator=(const swap_with&); + }; /////////////////////////////////////////////////////////////////////////////// @@ -759,6 +763,9 @@ public: // visitor interfaces return Comp()(lhs_content, rhs_content); } +private: + comparer& operator=(const comparer&); + }; /////////////////////////////////////////////////////////////////////////////// |