|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68264 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/fusion/container/list/detail boost/fusion/sequence/comparison boost/fusion/sequence/comparison/detail boost/fusion/support boost/gil boost/graph boost/icl boost/integer boost/interprocess boost/intrusive boost/io boost/iostreams boost/iterator boost/math boost/msm boost/numeric/ublas boost/pool boost/program_options boost/program_options/detail boost/property_tree boost/proto 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/typeof boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/algorithm/string libs/array libs/array/doc libs/array/test libs/bimap libs/config libs/date_time libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/icl libs/icl/doc libs/icl/doc/html libs/icl/doc/html/header/boost/icl libs/icl/test libs/icl/test/test_doc_code_ libs/integer libs/interprocess libs/intrusive libs/io libs/io/doc libs/iostreams libs/iterator/test libs/math libs/math/build libs/math/config libs/math/doc libs/math/doc/complex libs/math/doc/distexplorer libs/math/doc/gcd libs/math/doc/html libs/math/doc/octonion libs/math/doc/quaternion libs/math/doc/sf_and_dist libs/math/doc/sf_and_dist/html libs/math/doc/sf_and_dist/html/math_toolkit/main_overview libs/math/dot_net_example libs/math/example libs/math/minimax libs/math/performance libs/math/src libs/math/test libs/math/tools libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/pool libs/program_options libs/program_options/test libs/property_tree libs/python libs/range libs/regex libs/regex/build libs/serialization libs/serialization/doc libs/serialization/example libs/serialization/src libs/serialization/test libs/serialization/vc7ide 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/type_traits/doc libs/typeof/doc libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave more more/getting_started status tools tools/bcp tools/boostbook tools/build/v2 tools/inspect tools/quickbook tools/quickbook/src tools/quickbook/test tools/regression tools/regression/src tools/release tools/wave
From: eric_at_[hidden]
Date: 2011-01-18 23:28:21
Author: eric_niebler
Date: 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
New Revision: 68264
URL: http://svn.boost.org/trac/boost/changeset/68264
Log:
fix 1.46 showstopper, fix #5084
Added:
branches/release/boost/fusion/sequence/comparison/enable_comparison.hpp
- copied, changed from r68225, /trunk/boost/fusion/sequence/comparison/enable_comparison.hpp
Removed:
branches/release/boost/fusion/sequence/comparison/detail/enable_comparison.hpp
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/concept_check.hpp (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/filesystem.hpp (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/fusion/container/list/detail/build_cons.hpp (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/icl/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/io/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/iterator/iterator_facade.hpp (props changed)
branches/release/boost/iterator/transform_iterator.hpp (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/math_fwd.hpp (props changed)
branches/release/boost/msm/ (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/numeric/ublas/functional.hpp (props changed)
branches/release/boost/pool/ (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/program_options/detail/parsers.hpp (props changed)
branches/release/boost/program_options/parsers.hpp (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/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/signals2.hpp (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/token_functions.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/typeof/message.hpp (props changed)
branches/release/boost/typeof/register_functions.hpp (props changed)
branches/release/boost/typeof/register_functions_iterate.hpp (props changed)
branches/release/boost/typeof/typeof.hpp (props changed)
branches/release/boost/typeof/unsupported.hpp (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/algorithm/string/ (props changed)
branches/release/libs/array/ (props changed)
branches/release/libs/array/doc/array.xml (props changed)
branches/release/libs/array/test/Jamfile.v2 (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/array/test/array6.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/date_time/ (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/icl/ (props changed)
branches/release/libs/icl/doc/ (props changed)
branches/release/libs/icl/doc/html/ (props changed)
branches/release/libs/icl/doc/html/header/boost/icl/ (props changed)
branches/release/libs/icl/test/ (props changed)
branches/release/libs/icl/test/test_doc_code_/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/io/ (props changed)
branches/release/libs/io/doc/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/iterator/test/transform_iterator_test.cpp (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/math/build/ (props changed)
branches/release/libs/math/config/ (props changed)
branches/release/libs/math/doc/ (props changed)
branches/release/libs/math/doc/complex/ (props changed)
branches/release/libs/math/doc/distexplorer/ (props changed)
branches/release/libs/math/doc/gcd/ (props changed)
branches/release/libs/math/doc/html/ (props changed)
branches/release/libs/math/doc/octonion/ (props changed)
branches/release/libs/math/doc/quaternion/ (props changed)
branches/release/libs/math/doc/sf_and_dist/ (props changed)
branches/release/libs/math/doc/sf_and_dist/html/ (props changed)
branches/release/libs/math/doc/sf_and_dist/html/math_toolkit/main_overview/faq.html (props changed)
branches/release/libs/math/dot_net_example/ (props changed)
branches/release/libs/math/example/ (props changed)
branches/release/libs/math/minimax/ (props changed)
branches/release/libs/math/performance/ (props changed)
branches/release/libs/math/src/ (props changed)
branches/release/libs/math/test/ (props changed)
branches/release/libs/math/tools/ (props changed)
branches/release/libs/mpi/build/ (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/msm/ (props changed)
branches/release/libs/numeric/ublas/ (props changed)
branches/release/libs/numeric/ublas/doc/ (props changed)
branches/release/libs/pool/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/program_options/test/parsers_test.cpp (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/regex/build/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/serialization/doc/ (props changed)
branches/release/libs/serialization/example/ (props changed)
branches/release/libs/serialization/src/ (props changed)
branches/release/libs/serialization/test/test_diamond_complex.cpp (props changed)
branches/release/libs/serialization/vc7ide/ (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/type_traits/doc/ (props changed)
branches/release/libs/typeof/doc/typeof.qbk (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/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/status/explicit-failures-markup.xml (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/user-config.jam (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/quickbook/src/ (props changed)
branches/release/tools/quickbook/test/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/regression/src/library_status.cpp (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/boost/fusion/sequence/comparison/enable_comparison.hpp | 6 -
branches/release/boost/fusion/sequence/comparison/equal_to.hpp | 6
branches/release/boost/fusion/sequence/comparison/greater.hpp | 6
branches/release/boost/fusion/sequence/comparison/greater_equal.hpp | 6
branches/release/boost/fusion/sequence/comparison/less.hpp | 6
branches/release/boost/fusion/sequence/comparison/less_equal.hpp | 10 +-
branches/release/boost/fusion/sequence/comparison/not_equal_to.hpp | 6
branches/release/boost/fusion/support/is_sequence.hpp | 7 +
branches/release/boost/proto/fusion.hpp | 34 ++++++++
branches/release/libs/spirit/doc/acknowledgments.qbk | 153 ++++++++++++++++++++-------------------
10 files changed, 137 insertions(+), 103 deletions(-)
Deleted: branches/release/boost/fusion/sequence/comparison/detail/enable_comparison.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/comparison/detail/enable_comparison.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
+++ (empty file)
@@ -1,41 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- Distributed under the Boost Software License, Version 1.0. (See accompanying
- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_ENABLE_COMPARISON_09232005_1958)
-#define FUSION_ENABLE_COMPARISON_09232005_1958
-
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/not.hpp>
-#include <boost/mpl/equal_to.hpp>
-#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/is_sequence.hpp>
-#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-
-namespace boost { namespace fusion { namespace detail
-{
- template <typename Sequence>
- struct is_native_fusion_sequence
- : is_convertible<Sequence, detail::from_sequence_convertible_type>
- {};
-
- template <typename Seq1, typename Seq2>
- struct enable_equality
- : mpl::or_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >
- {};
-
- template <typename Seq1, typename Seq2>
- struct enable_comparison
- : mpl::and_<
- mpl::or_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >
- , mpl::equal_to<result_of::size<Seq1>, result_of::size<Seq2> >
- >
- {};
-
-}}}
-
-#endif
Copied: branches/release/boost/fusion/sequence/comparison/enable_comparison.hpp (from r68225, /trunk/boost/fusion/sequence/comparison/enable_comparison.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/comparison/enable_comparison.hpp (original)
+++ branches/release/boost/fusion/sequence/comparison/enable_comparison.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -14,15 +14,9 @@
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/is_sequence.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/type_traits/is_convertible.hpp>
namespace boost { namespace fusion { namespace traits
{
- template <typename Sequence, typename Enable = void>
- struct is_native_fusion_sequence
- : is_convertible<Sequence, detail::from_sequence_convertible_type>
- {};
-
template <typename Seq1, typename Seq2, typename Enable = void>
struct enable_equality
: mpl::or_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >
Modified: branches/release/boost/fusion/sequence/comparison/equal_to.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/comparison/equal_to.hpp (original)
+++ branches/release/boost/fusion/sequence/comparison/equal_to.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(FUSION_EQUAL_TO_05052005_0431)
@@ -12,7 +12,7 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/comparison/detail/equal_to.hpp>
-#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#include <boost/config.hpp>
#if defined (BOOST_MSVC)
@@ -38,7 +38,7 @@
template <typename Seq1, typename Seq2>
inline typename
enable_if<
- detail::enable_equality<Seq1, Seq2>
+ traits::enable_equality<Seq1, Seq2>
, bool
>::type
operator==(Seq1 const& a, Seq2 const& b)
Modified: branches/release/boost/fusion/sequence/comparison/greater.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/comparison/greater.hpp (original)
+++ branches/release/boost/fusion/sequence/comparison/greater.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(FUSION_GREATER_05052005_0432)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#if defined(FUSION_DIRECT_OPERATOR_USAGE)
#include <boost/fusion/sequence/comparison/detail/greater.hpp>
@@ -38,7 +38,7 @@
template <typename Seq1, typename Seq2>
inline typename
enable_if<
- detail::enable_comparison<Seq1, Seq2>
+ traits::enable_comparison<Seq1, Seq2>
, bool
>::type
operator>(Seq1 const& a, Seq2 const& b)
Modified: branches/release/boost/fusion/sequence/comparison/greater_equal.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/comparison/greater_equal.hpp (original)
+++ branches/release/boost/fusion/sequence/comparison/greater_equal.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(FUSION_GREATER_EQUAL_05052005_0432)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#if defined(FUSION_DIRECT_OPERATOR_USAGE)
#include <boost/fusion/sequence/comparison/detail/greater_equal.hpp>
@@ -38,7 +38,7 @@
template <typename Seq1, typename Seq2>
inline typename
enable_if<
- detail::enable_comparison<Seq1, Seq2>
+ traits::enable_comparison<Seq1, Seq2>
, bool
>::type
operator>=(Seq1 const& a, Seq2 const& b)
Modified: branches/release/boost/fusion/sequence/comparison/less.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/comparison/less.hpp (original)
+++ branches/release/boost/fusion/sequence/comparison/less.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(FUSION_LESS_05052005_0432)
@@ -12,7 +12,7 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/comparison/detail/less.hpp>
-#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
namespace boost { namespace fusion
{
@@ -29,7 +29,7 @@
template <typename Seq1, typename Seq2>
inline typename
enable_if<
- detail::enable_comparison<Seq1, Seq2>
+ traits::enable_comparison<Seq1, Seq2>
, bool
>::type
operator<(Seq1 const& a, Seq2 const& b)
Modified: branches/release/boost/fusion/sequence/comparison/less_equal.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/comparison/less_equal.hpp (original)
+++ branches/release/boost/fusion/sequence/comparison/less_equal.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(FUSION_LESS_EQUAL_05052005_0432)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#if defined(FUSION_DIRECT_OPERATOR_USAGE)
#include <boost/fusion/sequence/comparison/detail/less_equal.hpp>
@@ -35,7 +35,7 @@
namespace operators
{
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400)
+#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400)
// Workaround for VC8.0 and VC7.1
template <typename Seq1, typename Seq2>
inline bool
@@ -60,12 +60,12 @@
#else
// Somehow VC8.0 and VC7.1 does not like this code
-// but barfs somewhere else.
+// but barfs somewhere else.
template <typename Seq1, typename Seq2>
inline typename
enable_if<
- detail::enable_comparison<Seq1, Seq2>
+ traits::enable_comparison<Seq1, Seq2>
, bool
>::type
operator<=(Seq1 const& a, Seq2 const& b)
Modified: branches/release/boost/fusion/sequence/comparison/not_equal_to.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/comparison/not_equal_to.hpp (original)
+++ branches/release/boost/fusion/sequence/comparison/not_equal_to.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(FUSION_NOT_EQUAL_TO_05052005_0431)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#if defined(FUSION_DIRECT_OPERATOR_USAGE)
#include <boost/fusion/sequence/comparison/detail/not_equal_to.hpp>
@@ -41,7 +41,7 @@
template <typename Seq1, typename Seq2>
inline typename
enable_if<
- detail::enable_equality<Seq1, Seq2>
+ traits::enable_equality<Seq1, Seq2>
, bool
>::type
operator!=(Seq1 const& a, Seq2 const& b)
Modified: branches/release/boost/fusion/support/is_sequence.hpp
==============================================================================
--- branches/release/boost/fusion/support/is_sequence.hpp (original)
+++ branches/release/boost/fusion/support/is_sequence.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(FUSION_IS_SEQUENCE_05052005_1002)
@@ -63,6 +63,11 @@
typename fusion::detail::tag_of<T>::type
>::template apply<T>
{};
+
+ template <typename Sequence, typename Enable = void>
+ struct is_native_fusion_sequence
+ : is_convertible<Sequence, detail::from_sequence_convertible_type>
+ {};
}
}}
Modified: branches/release/boost/proto/fusion.hpp
==============================================================================
--- branches/release/boost/proto/fusion.hpp (original)
+++ branches/release/boost/proto/fusion.hpp 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -11,8 +11,10 @@
#include <boost/config.hpp>
#include <boost/mpl/if.hpp>
+#include <boost/mpl/bool.hpp>
#include <boost/mpl/long.hpp>
#include <boost/mpl/sequence_tag_fwd.hpp>
+#include <boost/utility/enable_if.hpp>
#include <boost/fusion/include/is_view.hpp>
#include <boost/fusion/include/tag_of_fwd.hpp>
#include <boost/fusion/include/category_of.hpp>
@@ -23,6 +25,7 @@
#include <boost/fusion/support/ext_/is_segmented.hpp>
#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
#include <boost/fusion/sequence/intrinsic/ext_/size_s.hpp>
+#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
#include <boost/fusion/view/ext_/segmented_iterator.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/traits.hpp>
@@ -636,6 +639,37 @@
}
+ namespace traits
+ {
+ template<typename Seq1, typename Seq2>
+ struct enable_equality<
+ Seq1
+ , Seq2
+ , typename enable_if_c<
+ mpl::or_<
+ proto::is_expr<Seq1>
+ , proto::is_expr<Seq2>
+ >::value
+ >::type
+ >
+ : mpl::false_
+ {};
+
+ template<typename Seq1, typename Seq2>
+ struct enable_comparison<
+ Seq1
+ , Seq2
+ , typename enable_if_c<
+ mpl::or_<
+ proto::is_expr<Seq1>
+ , proto::is_expr<Seq2>
+ >::value
+ >::type
+ >
+ : mpl::false_
+ {};
+ }
+
}}
namespace boost { namespace mpl
Modified: branches/release/libs/spirit/doc/acknowledgments.qbk
==============================================================================
--- branches/release/libs/spirit/doc/acknowledgments.qbk (original)
+++ branches/release/libs/spirit/doc/acknowledgments.qbk 2011-01-18 23:28:17 EST (Tue, 18 Jan 2011)
@@ -8,36 +8,37 @@
[section Acknowledgments]
-This version of Spirit is a complete rewrite of the /classic/ Spirit many
-people have been contributing to (see below). But there are a couple of people
-who already managed to help significantly during this rewrite. We would like to
+This version of Spirit is a complete rewrite of the /classic/ Spirit many
+people have been contributing to (see below). But there are a couple of people
+who already managed to help significantly during this rewrite. We would like to
express our special acknowledgement to (in no particular order):
-[*Eric Niebler] for writing Boost.Proto, without which this rewrite wouldn't
+[*Eric Niebler] for writing Boost.Proto, without which this rewrite wouldn't
have been possible, and helping with examples, advice, and suggestions on
how to use Boost.Proto in the best possible way.
-[*Ben Hanson] for providing us with an early version of his __lexertl__ library,
-which is proposed to be included into Boost (as Boost.Lexer). At the time
+[*Ben Hanson] for providing us with an early version of his __lexertl__ library,
+which is proposed to be included into Boost (as Boost.Lexer). At the time
of this writing the Boost review for this library is still pending.
-[*Francois Barel] for his silent but steady work on making and keeping Spirit
-compatible with all versions of gcc, older and newest ones. He not only
-contributed subrules to Spirit V2.1, but always keeps an eye on the small
+[*Francois Barel] for his silent but steady work on making and keeping Spirit
+compatible with all versions of gcc, older and newest ones. He not only
+contributed subrules to Spirit V2.1, but always keeps an eye on the small
details which are so important to make a difference.
-[*Andreas Haberstroh] for proof reading the documentation and fixing those
-non-native-speaker-quirks we managed to introduce into the first versions of
+[*Andreas Haberstroh] for proof reading the documentation and fixing those
+non-native-speaker-quirks we managed to introduce into the first versions of
the documentation.
[*Chris Hoeppler] for taking up the editorial tasks for the initial
version of this documentation together with Andreas Haberstroh. Chris
did a lot especially at the last minute when we are about to release.
-[*Michael Caisse] (a.k.a mjcaisse) for being Spirit's evangelist on freenode's
-#boost IRC . No Spirit question asked there stays without an answer because of
-his active involvment. Also, we would like to thank him for last minute editing
-work on the 2.1 release documentation.
+[*Michael Caisse] (a.k.a mjcaisse) for being Spirit's benevolent
+evangelist on freenode's #boost IRC . No Spirit question asked there
+stays without an answer because of his active involvement. Also, we would
+like to thank him for last minute editing work on the 2.1 release
+documentation.
[*Tobias Schwinger] for proposing expectation points and GCC port of an
early version.
@@ -47,40 +48,40 @@
reviewing the code and providing valuable feedback and for always
keeping us on our toes.
-[*OvermindDL] for his creative ideas on the mailing list helping to resolve
+[*OvermindDL] for his creative ideas on the mailing list helping to resolve
even more difficult user problems.
[*Carl Barron] for his early adoption and valuable feedback on the Lexer
library forcing us to design a proper API covering all of his use cases.
He also contributed an early version of the variadic attribute API for
-Qi.
+Qi.
[*Daniel James] for improving and maintaining Quickbook, the tool we use
for this documentation. Also, for bits and pieces here and there such
documentation suggestions and editorial patches.
-[*Stephan Menzel] for his early adoption of Qi and Karma and his willingness
+[*Stephan Menzel] for his early adoption of Qi and Karma and his willingness
to invest time to spot bugs which were hard to isolate. Also, for his feedback
on the documentation.
-[*Ray Burkholder] and [*Dainis Polis] for last minute feedback on the
+[*Ray Burkholder] and [*Dainis Polis] for last minute feedback on the
documentation.
[*Steve Brandt] for his his effort trying to put Qi and Karma to some use while
writing a source to source language transformation tool. He made many incredible
suggestions helping to improve the usability of both libraries.
-[*Bryce Leylbach] (a.k.a. wash) for contributing the components `qi::`__qi_as__
-and `karma::`__karma_as__, for working on __utree__ and its integration with
-Qi and Karma, for adding numeric parser literals, for contributing the related
-documentation, and for being a big help in the everyday maintenance of the
+[*Bryce Leylbach] (a.k.a. wash) for contributing the components `qi::`__qi_as__
+and `karma::`__karma_as__, for working on __utree__ and its integration with
+Qi and Karma, for adding numeric parser literals, for contributing the related
+documentation, and for being a big help in the everyday maintenance of the
library's (and our) sanity.
-[*Mathias Gaunard] for his bug reports, suggestions and regression test
-contributions to the Lexer helping to find subtle bugs and to improve its
+[*Mathias Gaunard] for his bug reports, suggestions and regression test
+contributions to the Lexer helping to find subtle bugs and to improve its
overall usability.
-[*Thomas Bernard] (a.k.a. teajay) for working on the keyword parser and for
+[*Thomas Bernard] (a.k.a. teajay) for working on the keyword parser and for
adding explicit names to the `qi::`__qi_symbols__ component.
Special thanks to spirit-devel and spirit-general mailing lists for
@@ -102,50 +103,50 @@
Special thanks for working on Spirit /classic/ to:
-[*Dan Nuffer] for his work on lexers, parse trees, ASTs, XML parsers, the
-multi-pass iterator as well as administering Spirit's site, editing,
-maintaining the CVS and doing the releases plus a zillion of other chores that
-were almost taken for granted.
-
-[*Hartmut Kaiser] for his work on the C parser, the work on the C/C++
-preprocessor, utility parsers, the original port to Intel 5.0, various work on
-Phoenix, porting to v1.5, the meta-parsers, the grouping-parsers, extensive
+[*Dan Nuffer] for his work on lexers, parse trees, ASTs, XML parsers, the
+multi-pass iterator as well as administering Spirit's site, editing,
+maintaining the CVS and doing the releases plus a zillion of other chores that
+were almost taken for granted.
+
+[*Hartmut Kaiser] for his work on the C parser, the work on the C/C++
+preprocessor, utility parsers, the original port to Intel 5.0, various work on
+Phoenix, porting to v1.5, the meta-parsers, the grouping-parsers, extensive
testing and painstaking attention to details.
-[*Martin Wille] who improved grammar multi thread safety, contributed the eol_p
-parser, the dynamic parsers, documentation and for taking an active role in
-almost every aspect from brainstorming and design to coding. And, as always,
-helps keep the regression tests for g++ on Linux as green as ever :-).
+[*Martin Wille] who improved grammar multi thread safety, contributed the eol_p
+parser, the dynamic parsers, documentation and for taking an active role in
+almost every aspect from brainstorming and design to coding. And, as always,
+helps keep the regression tests for g++ on Linux as green as ever :-).
-[*Martijn W. Van Der Lee] our Web site administrator and for contributing the
+[*Martijn W. Van Der Lee] our Web site administrator and for contributing the
RFC821 parser.
-[*Giovanni Bajo] for last minute tweaks of Spirit 1.8.0 for CodeWarrior 8.3.
-Actually, I'm ashamed Giovanni was not in this list already. He's done a lot
-since Spirit 1.5, the first Boost.Spirit release. He's instrumental in the
-porting of the Spirit iterators stuff to the new Boost Iterators Library
-(version 2). He also did various bug fixes and wrote some tests here and there.
+[*Giovanni Bajo] for last minute tweaks of Spirit 1.8.0 for CodeWarrior 8.3.
+Actually, I'm ashamed Giovanni was not in this list already. He's done a lot
+since Spirit 1.5, the first Boost.Spirit release. He's instrumental in the
+porting of the Spirit iterators stuff to the new Boost Iterators Library
+(version 2). He also did various bug fixes and wrote some tests here and there.
-[*Juan Carlos Arevalo-Baeza (JCAB)*] for his work on the C++ parser, the position
-iterator, ports to v1.5 and keeping the mailing list discussions alive and
+[*Juan Carlos Arevalo-Baeza (JCAB)*] for his work on the C++ parser, the position
+iterator, ports to v1.5 and keeping the mailing list discussions alive and
kicking.
-[*Vaclav Vesely], lots of stuff, the no\_actions directive, various patches
-fixes, the distinct parsers, the lazy parser, some phoenix tweaks and add-ons
-(e.g. new\_). Also, *Stefan Slapeta] and wife for editing Vaclav's distinct
-parser doc.
+[*Vaclav Vesely], lots of stuff, the no\_actions directive, various patches
+fixes, the distinct parsers, the lazy parser, some phoenix tweaks and add-ons
+(e.g. new\_). Also, *Stefan Slapeta] and wife for editing Vaclav's distinct
+parser doc.
-[*Raghavendra Satish] for doing the original v1.3 port to VC++ and his work on
+[*Raghavendra Satish] for doing the original v1.3 port to VC++ and his work on
Phoenix.
[*Noah Stein] for following up and helping Ragav on the VC++ ports.
[*Hakki Dogusan], for his original v1.0 Pascal parser.
-[*John (EBo) David] for his work on the VM and watching over my shoulder as I
+[*John (EBo) David] for his work on the VM and watching over my shoulder as I
code giving the impression of distance eXtreme programming.
-[*Chris Uzdavinis] for feeding in comments and valuable suggestions as well as
+[*Chris Uzdavinis] for feeding in comments and valuable suggestions as well as
editing the documentation.
[*Carsten Stoll], for his work on dynamic parsers.
@@ -154,68 +155,68 @@
[*Bruce Florman], who did the original v1.0 port to VC++.
-[*Jeff Westfahl] for porting the loop parsers to v1.5 and contributing the file
+[*Jeff Westfahl] for porting the loop parsers to v1.5 and contributing the file
iterator.
-[*Peter Simons] for the RFC date parser example and tutorial plus helping out
+[*Peter Simons] for the RFC date parser example and tutorial plus helping out
with some nitty gritty details.
-[*Markus Sch'''ö'''pflin] for suggesting the end_p parser and lots of other
+[*Markus Sch'''ö'''pflin] for suggesting the end_p parser and lots of other
nifty things and his active presence in the mailing list.
-[*Doug Gregor] for mentoring and his ability to see things that others don't.
+[*Doug Gregor] for mentoring and his ability to see things that others don't.
-[*David Abrahams] for giving Joel a job that allows him to still work on Spirit,
-plus countless advice and help on C++ and specifically template
+[*David Abrahams] for giving Joel a job that allows him to still work on Spirit,
+plus countless advice and help on C++ and specifically template
metaprogramming.
-[*Aleksey Gurtovoy] for his MPL library from which we stole many metaprogramming
+[*Aleksey Gurtovoy] for his MPL library from which we stole many metaprogramming
tricks especially for less conforming compilers such as Borland and VC6/7.
-[*Gustavo Guerra] for his last minute review of Spirit and constant feedback,
-plus patches here and there (e.g. proposing the new dot behavior of the real
+[*Gustavo Guerra] for his last minute review of Spirit and constant feedback,
+plus patches here and there (e.g. proposing the new dot behavior of the real
numerics parsers).
-[*Nicola Musatti], [*Paul Snively], [*Alisdair Meredith] and [*Hugo Duncan] for
+[*Nicola Musatti], [*Paul Snively], [*Alisdair Meredith] and [*Hugo Duncan] for
testing and sending in various patches.
-[*Steve Rowe] for his splendid work on the TSTs that will soon be taken into
+[*Steve Rowe] for his splendid work on the TSTs that will soon be taken into
Spirit.
[*Jonathan de Halleux] for his work on actors.
-[*Angus Leeming] for last minute editing work on the 1.8.0 release
-documentation, his work on Phoenix and his active presence in the Spirit
+[*Angus Leeming] for last minute editing work on the 1.8.0 release
+documentation, his work on Phoenix and his active presence in the Spirit
mailing list.
-[*Joao Abecasis] for his active presence in the Spirit mailing list, providing
-user support, participating in the discussions and so on.
+[*Joao Abecasis] for his active presence in the Spirit mailing list, providing
+user support, participating in the discussions and so on.
-[*Guillaume Melquiond] for a last minute patch to multi_pass for 1.8.1.
+[*Guillaume Melquiond] for a last minute patch to multi_pass for 1.8.1.
-[*Peder Holt] for his porting work on Phoenix, Fusion and Spirit to VC6.
+[*Peder Holt] for his porting work on Phoenix, Fusion and Spirit to VC6.
To Joel's wife Mariel who did the graphics in this document.
-My, there's a lot in this list! And it's a continuing list. We add people to
+My, there's a lot in this list! And it's a continuing list. We add people to
this list every time. We hope we did not forget anyone. If we missed
someone you know who has helped in any way, please inform us.
-Special thanks also to people who gave feedback and valuable comments,
-particularly members of Boost and Spirit mailing lists. This includes all those
+Special thanks also to people who gave feedback and valuable comments,
+particularly members of Boost and Spirit mailing lists. This includes all those
who participated in the review:
[*John Maddock], our review manager, [*Aleksey Gurtovoy], [*Andre Hentz],
[*Beman Dawes], [*Carl Daniel], [*Christopher Currie], [*Dan Gohman],
[*Dan Nuffer], [*Daryle Walker], [*David Abrahams], [*David B. Held],
[*Dirk Gerrits], [*Douglas Gregor], [*Hartmut Kaiser], [*Iain K.Hanson],
-[*Juan Carlos Arevalo-Baeza], [*Larry Evans], [*Martin Wille],
+[*Juan Carlos Arevalo-Baeza], [*Larry Evans], [*Martin Wille],
[*Mattias Flodin], [*Noah Stein], [*Nuno Lucas], [*Peter Dimov],
[*Peter Simons], [*Petr Kocmid], [*Ross Smith], [*Scott Kirkwood],
[*Steve Cleary], [*Thorsten Ottosen], [*Tom Wenisch], [*Vladimir Prus]
-Finally thanks to SourceForge for hosting the Spirit project and Boost: a C++
-community comprised of extremely talented library authors who participate in
+Finally thanks to SourceForge for hosting the Spirit project and Boost: a C++
+community comprised of extremely talented library authors who participate in
the discussion and peer review of well crafted C++ libraries.
[endsect]
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