Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r62742 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/integer boost/interprocess boost/intrusive boost/iostreams boost/math boost/numeric/ublas boost/program_options boost/property_tree boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/tr1 boost/type_traits boost/unordered boost/utility boost/uuid boost/variant boost/variant/detail boost/wave doc libs libs/array/doc libs/array/test libs/bimap libs/config libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/range libs/range/doc libs/regex libs/regex/doc libs/serialization libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/tr1 libs/type_traits libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/variant/test libs/wave more more/getting_started people status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/jam tools/quickbook tools/regression tools/release tools/wave wiki
From: steven_at_[hidden]
Date: 2010-06-10 11:32:12

Author: steven_watanabe
Date: 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
New Revision: 62742
URL: http://svn.boost.org/trac/boost/changeset/62742

Log:
Merge variant from the trunk. Fixes #1507
Properties modified:
   branches/release/ (props changed)
   branches/release/INSTALL (props changed)
   branches/release/Jamroot (props changed)
   branches/release/LICENSE_1_0.txt (props changed)
   branches/release/boost/ (props changed)
   branches/release/boost-build.jam (props changed)
   branches/release/boost.css (props changed)
   branches/release/boost.png (props changed)
   branches/release/boost/algorithm/string/ (props changed)
   branches/release/boost/archive/ (props changed)
   branches/release/boost/array.hpp (props changed)
   branches/release/boost/bimap/ (props changed)
   branches/release/boost/config/ (props changed)
   branches/release/boost/config.hpp (props changed)
   branches/release/boost/detail/ (props changed)
   branches/release/boost/detail/endian.hpp (props changed)
   branches/release/boost/filesystem/ (props changed)
   branches/release/boost/functional/hash/ (props changed)
   branches/release/boost/fusion/ (props changed)
   branches/release/boost/gil/ (props changed)
   branches/release/boost/graph/ (props changed)
   branches/release/boost/integer/ (props changed)
   branches/release/boost/interprocess/ (props changed)
   branches/release/boost/intrusive/ (props changed)
   branches/release/boost/iostreams/ (props changed)
   branches/release/boost/math/ (props changed)
   branches/release/boost/numeric/ublas/ (props changed)
   branches/release/boost/program_options/ (props changed)
   branches/release/boost/property_tree/ (props changed)
   branches/release/boost/python/ (props changed)
   branches/release/boost/range/ (props changed)
   branches/release/boost/regex/ (props changed)
   branches/release/boost/serialization/ (props changed)
   branches/release/boost/serialization/factory.hpp (props changed)
   branches/release/boost/signals/ (props changed)
   branches/release/boost/signals2/ (props changed)
   branches/release/boost/spirit/ (props changed)
   branches/release/boost/spirit/home/ (props changed)
   branches/release/boost/spirit/home/karma/ (props changed)
   branches/release/boost/spirit/home/support/attributes.hpp (props changed)
   branches/release/boost/statechart/ (props changed)
   branches/release/boost/system/ (props changed)
   branches/release/boost/thread/ (props changed)
   branches/release/boost/thread.hpp (props changed)
   branches/release/boost/tr1/ (props changed)
   branches/release/boost/type_traits/ (props changed)
   branches/release/boost/unordered/ (props changed)
   branches/release/boost/utility/ (props changed)
   branches/release/boost/utility/value_init.hpp (props changed)
   branches/release/boost/uuid/ (props changed)
   branches/release/boost/variant/ (props changed)
   branches/release/boost/version.hpp (props changed)
   branches/release/boost/wave/ (props changed)
   branches/release/bootstrap.bat (props changed)
   branches/release/bootstrap.sh (props changed)
   branches/release/doc/ (props changed)
   branches/release/index.htm (props changed)
   branches/release/index.html (props changed)
   branches/release/libs/ (props changed)
   branches/release/libs/array/doc/array.xml (props changed)
   branches/release/libs/array/test/array0.cpp (props changed)
   branches/release/libs/bimap/ (props changed)
   branches/release/libs/config/ (props changed)
   branches/release/libs/filesystem/ (props changed)
   branches/release/libs/functional/hash/ (props changed)
   branches/release/libs/fusion/ (props changed)
   branches/release/libs/graph_parallel/ (props changed)
   branches/release/libs/integer/ (props changed)
   branches/release/libs/interprocess/ (props changed)
   branches/release/libs/intrusive/ (props changed)
   branches/release/libs/iostreams/ (props changed)
   branches/release/libs/libraries.htm (props changed)
   branches/release/libs/maintainers.txt (props changed)
   branches/release/libs/math/ (props changed)
   branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
   branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
   branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
   branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
   branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
   branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
   branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
   branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
   branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
   branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
   branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
   branches/release/libs/numeric/ublas/ (props changed)
   branches/release/libs/numeric/ublas/doc/ (props changed)
   branches/release/libs/program_options/ (props changed)
   branches/release/libs/property_tree/ (props changed)
   branches/release/libs/python/ (props changed)
   branches/release/libs/range/ (props changed)
   branches/release/libs/range/doc/ (props changed)
   branches/release/libs/regex/ (props changed)
   branches/release/libs/regex/doc/ (props changed)
   branches/release/libs/serialization/ (props changed)
   branches/release/libs/signals/ (props changed)
   branches/release/libs/signals2/ (props changed)
   branches/release/libs/spirit/ (props changed)
   branches/release/libs/spirit/classic/example/ (props changed)
   branches/release/libs/spirit/doc/ (props changed)
   branches/release/libs/spirit/example/ (props changed)
   branches/release/libs/spirit/phoenix/ (props changed)
   branches/release/libs/spirit/test/ (props changed)
   branches/release/libs/spirit/test/qi/optional.cpp (props changed)
   branches/release/libs/statechart/ (props changed)
   branches/release/libs/static_assert/ (props changed)
   branches/release/libs/system/ (props changed)
   branches/release/libs/thread/ (props changed)
   branches/release/libs/timer/ (props changed)
   branches/release/libs/tr1/ (props changed)
   branches/release/libs/type_traits/ (props changed)
   branches/release/libs/unordered/ (props changed)
   branches/release/libs/utility/ (props changed)
   branches/release/libs/utility/swap.html (props changed)
   branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
   branches/release/libs/utility/value_init.htm (props changed)
   branches/release/libs/utility/value_init_test.cpp (props changed)
   branches/release/libs/uuid/ (props changed)
   branches/release/libs/wave/ (props changed)
   branches/release/more/ (props changed)
   branches/release/more/getting_started/ (props changed)
   branches/release/people/ (props changed)
   branches/release/rst.css (props changed)
   branches/release/status/ (props changed)
   branches/release/status/Jamfile.v2 (props changed)
   branches/release/tools/ (props changed)
   branches/release/tools/bcp/ (props changed)
   branches/release/tools/boostbook/ (props changed)
   branches/release/tools/build/v2/ (props changed)
   branches/release/tools/build/v2/tools/ (props changed)
   branches/release/tools/inspect/ (props changed)
   branches/release/tools/jam/ (props changed)
   branches/release/tools/quickbook/ (props changed)
   branches/release/tools/regression/ (props changed)
   branches/release/tools/release/ (props changed)
   branches/release/tools/wave/ (props changed)
   branches/release/wiki/ (props changed)
Text files modified:
   branches/release/boost/variant/detail/apply_visitor_binary.hpp | 10 ++++++++++
   branches/release/boost/variant/detail/apply_visitor_delayed.hpp | 3 +++
   branches/release/boost/variant/detail/apply_visitor_unary.hpp | 4 ++++
   branches/release/boost/variant/detail/variant_io.hpp | 3 +++
   branches/release/boost/variant/detail/visitation_impl.hpp | 8 ++++++++
   branches/release/boost/variant/variant.hpp | 7 +++++++
   branches/release/libs/variant/test/Jamfile.v2 | 7 +++++++
   branches/release/libs/variant/test/test7.cpp | 3 +++
   branches/release/libs/variant/test/test8.cpp | 2 ++
   9 files changed, 47 insertions(+), 0 deletions(-)

Modified: branches/release/boost/variant/detail/apply_visitor_binary.hpp
==============================================================================
--- branches/release/boost/variant/detail/apply_visitor_binary.hpp (original)
+++ branches/release/boost/variant/detail/apply_visitor_binary.hpp 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -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 @@
         return visitor_(value1_, value2);
     }

+private:
+ apply_visitor_binary_invoke& operator=(const apply_visitor_binary_invoke&);
+
};

template <typename Visitor, typename Visitable2>
@@ -100,6 +107,9 @@
         return boost::apply_visitor(invoker, visitable2_);
     }

+private:
+ apply_visitor_binary_unwrap& operator=(const apply_visitor_binary_unwrap&);
+
};

}} // namespace detail::variant

Modified: branches/release/boost/variant/detail/apply_visitor_delayed.hpp
==============================================================================
--- branches/release/boost/variant/detail/apply_visitor_delayed.hpp (original)
+++ branches/release/boost/variant/detail/apply_visitor_delayed.hpp 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -72,6 +72,9 @@
return apply_visitor(visitor_, visitable1, visitable2);
}

+private:
+ apply_visitor_delayed_t& operator=(const apply_visitor_delayed_t&);
+
};

template <typename Visitor>

Modified: branches/release/boost/variant/detail/apply_visitor_unary.hpp
==============================================================================
--- branches/release/boost/variant/detail/apply_visitor_unary.hpp (original)
+++ branches/release/boost/variant/detail/apply_visitor_unary.hpp 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -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 {

Modified: branches/release/boost/variant/detail/variant_io.hpp
==============================================================================
--- branches/release/boost/variant/detail/variant_io.hpp (original)
+++ branches/release/boost/variant/detail/variant_io.hpp 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -64,6 +64,9 @@
out_ << operand;
}

+private:
+ printer& operator=(const printer&);
+
};

}} // namespace detail::variant

Modified: branches/release/boost/variant/detail/visitation_impl.hpp
==============================================================================
--- branches/release/boost/variant/detail/visitation_impl.hpp (original)
+++ branches/release/boost/variant/detail/visitation_impl.hpp 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -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 @@
}} // namespace detail::variant
} // namespace boost

+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+# pragma warning(pop)
+#endif
+
#endif // BOOST_VARIANT_DETAIL_VISITATION_IMPL_HPP

Modified: branches/release/boost/variant/variant.hpp
==============================================================================
--- branches/release/boost/variant/variant.hpp (original)
+++ branches/release/boost/variant/variant.hpp 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -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 @@
         ::boost::detail::variant::move_swap( operand, other );
     }

+private:
+ swap_with& operator=(const swap_with&);
+
};

///////////////////////////////////////////////////////////////////////////////
@@ -759,6 +763,9 @@
         return Comp()(lhs_content, rhs_content);
     }

+private:
+ comparer& operator=(const comparer&);
+
};

///////////////////////////////////////////////////////////////////////////////

Modified: branches/release/libs/variant/test/Jamfile.v2
==============================================================================
--- branches/release/libs/variant/test/Jamfile.v2 (original)
+++ branches/release/libs/variant/test/Jamfile.v2 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -11,6 +11,11 @@
# provided the above notices are retained, and a notice that the code was
# modified is included with the above copyright notice.
#
+project
+ : requirements
+ #<dependency>/boost/test//minimal
+ <toolset>msvc:<asynch-exceptions>on
+ ;

test-suite variant
      :
@@ -28,3 +33,5 @@
     [ run variant_comparison_test.cpp ]
     [ run variant_visit_test.cpp ]
    ;
+
+

Modified: branches/release/libs/variant/test/test7.cpp
==============================================================================
--- branches/release/libs/variant/test/test7.cpp (original)
+++ branches/release/libs/variant/test/test7.cpp 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -197,6 +197,9 @@

ValueType& expected_;

+private:
+ compare_helper& operator=(const compare_helper&);
+
};

template<typename VariantType, typename ExpectedType>

Modified: branches/release/libs/variant/test/test8.cpp
==============================================================================
--- branches/release/libs/variant/test/test8.cpp (original)
+++ branches/release/libs/variant/test/test8.cpp 2010-06-10 11:32:07 EDT (Thu, 10 Jun 2010)
@@ -63,6 +63,7 @@
     try
     {
         T& r = get<T>(v);
+ (void)r; // suppress warning about r not being used
         BOOST_CHECK(false && &r); // should never reach
     }
     catch(boost::bad_get&)
@@ -110,3 +111,4 @@

    return boost::exit_success;
}
+

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk