|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63281 - 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/msm 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/wave boost/xpressive boost/xpressive/detail/core boost/xpressive/detail/utility 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/msm libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/range libs/range/doc libs/regex 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/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: eric_at_[hidden]
Date: 2010-06-24 00:21:12
Author: eric_niebler
Date: 2010-06-24 00:21:07 EDT (Thu, 24 Jun 2010)
New Revision: 63281
URL: http://svn.boost.org/trac/boost/changeset/63281
Log:
Merged revisions 61876,63280 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r61876 | dgregor | 2010-05-09 09:40:45 -0400 (Sun, 09 May 2010) | 8 lines
Both Proto and Xpressive have "ignore_unused" templates in their
detail headers, and both were getting included, causing overloading
ambiguities. There is probably a major cleanup to do here, moving to a
single "ignore_unused" in boost/detail, but for now I've rectified the
problem by describing importing Proto's ignore_unused() into Xpressive
rather than defining a new one.
........
r63280 | eric_niebler | 2010-06-24 00:08:23 -0400 (Thu, 24 Jun 2010) | 1 line
qualify calls to ignore_unused
........
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/msm/ (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/msm/ (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/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/xpressive/detail/core/icase.hpp | 2
branches/release/boost/xpressive/detail/utility/ignore_unused.hpp | 9 +---
branches/release/boost/xpressive/regex_actions.hpp | 36 +++++++++---------
branches/release/boost/xpressive/regex_primitives.hpp | 80 ++++++++++++++++++++--------------------
4 files changed, 62 insertions(+), 65 deletions(-)
Modified: branches/release/boost/xpressive/detail/core/icase.hpp
==============================================================================
--- branches/release/boost/xpressive/detail/core/icase.hpp (original)
+++ branches/release/boost/xpressive/detail/core/icase.hpp 2010-06-24 00:21:07 EDT (Thu, 24 Jun 2010)
@@ -33,7 +33,7 @@
{
inline void ignore_unused_icase()
{
- ignore_unused(icase);
+ detail::ignore_unused(icase);
}
}
Modified: branches/release/boost/xpressive/detail/utility/ignore_unused.hpp
==============================================================================
--- branches/release/boost/xpressive/detail/utility/ignore_unused.hpp (original)
+++ branches/release/boost/xpressive/detail/utility/ignore_unused.hpp 2010-06-24 00:21:07 EDT (Thu, 24 Jun 2010)
@@ -13,14 +13,11 @@
# pragma once
#endif
+#include "boost/proto/detail/ignore_unused.hpp"
+
namespace boost { namespace xpressive { namespace detail
{
-
- template<typename T>
- void ignore_unused(T const &)
- {
- }
-
+ using boost::proto::detail::ignore_unused;
}}}
#endif
Modified: branches/release/boost/xpressive/regex_actions.hpp
==============================================================================
--- branches/release/boost/xpressive/regex_actions.hpp (original)
+++ branches/release/boost/xpressive/regex_actions.hpp 2010-06-24 00:21:07 EDT (Thu, 24 Jun 2010)
@@ -856,24 +856,24 @@
{
inline void ignore_unused_regex_actions()
{
- ignore_unused(xpressive::push);
- ignore_unused(xpressive::push_back);
- ignore_unused(xpressive::push_front);
- ignore_unused(xpressive::pop);
- ignore_unused(xpressive::pop_back);
- ignore_unused(xpressive::pop_front);
- ignore_unused(xpressive::top);
- ignore_unused(xpressive::back);
- ignore_unused(xpressive::front);
- ignore_unused(xpressive::first);
- ignore_unused(xpressive::second);
- ignore_unused(xpressive::matched);
- ignore_unused(xpressive::length);
- ignore_unused(xpressive::str);
- ignore_unused(xpressive::insert);
- ignore_unused(xpressive::make_pair);
- ignore_unused(xpressive::check);
- ignore_unused(xpressive::let);
+ detail::ignore_unused(xpressive::push);
+ detail::ignore_unused(xpressive::push_back);
+ detail::ignore_unused(xpressive::push_front);
+ detail::ignore_unused(xpressive::pop);
+ detail::ignore_unused(xpressive::pop_back);
+ detail::ignore_unused(xpressive::pop_front);
+ detail::ignore_unused(xpressive::top);
+ detail::ignore_unused(xpressive::back);
+ detail::ignore_unused(xpressive::front);
+ detail::ignore_unused(xpressive::first);
+ detail::ignore_unused(xpressive::second);
+ detail::ignore_unused(xpressive::matched);
+ detail::ignore_unused(xpressive::length);
+ detail::ignore_unused(xpressive::str);
+ detail::ignore_unused(xpressive::insert);
+ detail::ignore_unused(xpressive::make_pair);
+ detail::ignore_unused(xpressive::check);
+ detail::ignore_unused(xpressive::let);
}
}
Modified: branches/release/boost/xpressive/regex_primitives.hpp
==============================================================================
--- branches/release/boost/xpressive/regex_primitives.hpp (original)
+++ branches/release/boost/xpressive/regex_primitives.hpp 2010-06-24 00:21:07 EDT (Thu, 24 Jun 2010)
@@ -879,46 +879,46 @@
{
inline void ignore_unused_regex_primitives()
{
- ignore_unused(repeat_max);
- ignore_unused(inf);
- ignore_unused(epsilon);
- ignore_unused(nil);
- ignore_unused(alnum);
- ignore_unused(bos);
- ignore_unused(eos);
- ignore_unused(bol);
- ignore_unused(eol);
- ignore_unused(bow);
- ignore_unused(eow);
- ignore_unused(_b);
- ignore_unused(_w);
- ignore_unused(_d);
- ignore_unused(_s);
- ignore_unused(_n);
- ignore_unused(_ln);
- ignore_unused(_);
- ignore_unused(self);
- ignore_unused(set);
- ignore_unused(s0);
- ignore_unused(s1);
- ignore_unused(s2);
- ignore_unused(s3);
- ignore_unused(s4);
- ignore_unused(s5);
- ignore_unused(s6);
- ignore_unused(s7);
- ignore_unused(s8);
- ignore_unused(s9);
- ignore_unused(a1);
- ignore_unused(a2);
- ignore_unused(a3);
- ignore_unused(a4);
- ignore_unused(a5);
- ignore_unused(a6);
- ignore_unused(a7);
- ignore_unused(a8);
- ignore_unused(a9);
- ignore_unused(as_xpr);
+ detail::ignore_unused(repeat_max);
+ detail::ignore_unused(inf);
+ detail::ignore_unused(epsilon);
+ detail::ignore_unused(nil);
+ detail::ignore_unused(alnum);
+ detail::ignore_unused(bos);
+ detail::ignore_unused(eos);
+ detail::ignore_unused(bol);
+ detail::ignore_unused(eol);
+ detail::ignore_unused(bow);
+ detail::ignore_unused(eow);
+ detail::ignore_unused(_b);
+ detail::ignore_unused(_w);
+ detail::ignore_unused(_d);
+ detail::ignore_unused(_s);
+ detail::ignore_unused(_n);
+ detail::ignore_unused(_ln);
+ detail::ignore_unused(_);
+ detail::ignore_unused(self);
+ detail::ignore_unused(set);
+ detail::ignore_unused(s0);
+ detail::ignore_unused(s1);
+ detail::ignore_unused(s2);
+ detail::ignore_unused(s3);
+ detail::ignore_unused(s4);
+ detail::ignore_unused(s5);
+ detail::ignore_unused(s6);
+ detail::ignore_unused(s7);
+ detail::ignore_unused(s8);
+ detail::ignore_unused(s9);
+ detail::ignore_unused(a1);
+ detail::ignore_unused(a2);
+ detail::ignore_unused(a3);
+ detail::ignore_unused(a4);
+ detail::ignore_unused(a5);
+ detail::ignore_unused(a6);
+ detail::ignore_unused(a7);
+ detail::ignore_unused(a8);
+ detail::ignore_unused(a9);
+ detail::ignore_unused(as_xpr);
}
}
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