Subject: [Boost-commit] svn:boost r61109 - in branches/release: . boost boost/algorithm/string boost/bimap boost/filesystem boost/fusion boost/graph boost/interprocess boost/intrusive boost/numeric/ublas boost/program_options boost/property_tree boost/regex boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/qi/nonterminal boost/spirit/home/support boost/spirit/home/support/char_encoding boost/system boost/tr1 boost/type_traits boost/variant boost/wave libs libs/array/doc libs/bimap libs/filesystem libs/fusion libs/graph_parallel libs/interprocess libs/intrusive libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/regex libs/regex/doc 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/static_assert libs/system libs/timer libs/tr1 libs/type_traits libs/wave more people status tools tools/bcp tools/inspect tools/regression tools/release tools/wave wiki
From: hartmut.kaiser_at_[hidden]
Date: 2010-04-06 14:31:23
Author: hkaiser
Date: 2010-04-06 14:31:22 EDT (Tue, 06 Apr 2010)
New Revision: 61109
URL: http://svn.boost.org/trac/boost/changeset/61109
Log:
Spirit: still fighting tree conflict...
Properties modified:
branches/release/ (props changed)
branches/release/CMakeLists.txt (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/bimap/ (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (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/regex/ (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/system/ (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (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/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/bimap/ (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/maintainers.txt (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/regex/ (props changed)
branches/release/libs/regex/doc/ (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/static_assert/ (props changed)
branches/release/libs/system/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/more/ (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/inspect/ (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/spirit/home/qi/nonterminal/simple_trace.hpp | 3 +++
branches/release/boost/spirit/home/support/char_encoding/ascii.hpp | 2 +-
branches/release/boost/spirit/home/support/char_encoding/iso8859_1.hpp | 2 +-
branches/release/boost/spirit/home/support/char_encoding/standard.hpp | 2 +-
branches/release/boost/spirit/home/support/common_terminals.hpp | 2 ++
5 files changed, 8 insertions(+), 3 deletions(-)
Modified: branches/release/boost/spirit/home/qi/nonterminal/simple_trace.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/nonterminal/simple_trace.hpp (original)
+++ branches/release/boost/spirit/home/qi/nonterminal/simple_trace.hpp 2010-04-06 14:31:22 EDT (Tue, 06 Apr 2010)
@@ -114,6 +114,9 @@
for (int i = 0; first != last && i != n && *first; ++i, ++first)
detail::token_printer(BOOST_SPIRIT_DEBUG_OUT, *first);
BOOST_SPIRIT_DEBUG_OUT << "</" << tag << '>' << std::endl;
+
+ // $$$ FIXME convert invalid xml characters (e.g. '<') to valid
+ // character entities. $$$
}
template <typename Iterator, typename Context, typename State>
Modified: branches/release/boost/spirit/home/support/char_encoding/ascii.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/char_encoding/ascii.hpp (original)
+++ branches/release/boost/spirit/home/support/char_encoding/ascii.hpp 2010-04-06 14:31:22 EDT (Tue, 06 Apr 2010)
@@ -179,7 +179,7 @@
static bool
isascii_(int ch)
{
- return (0 == (ch & ~0x7f)) ? true : false;
+ return 0 == (ch & ~0x7f);
}
static bool
Modified: branches/release/boost/spirit/home/support/char_encoding/iso8859_1.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/char_encoding/iso8859_1.hpp (original)
+++ branches/release/boost/spirit/home/support/char_encoding/iso8859_1.hpp 2010-04-06 14:31:22 EDT (Tue, 06 Apr 2010)
@@ -573,7 +573,7 @@
static bool
isascii_(int ch)
{
- return (0 == (ch & ~0x7f)) ? true : false;
+ return 0 == (ch & ~0x7f);
}
static bool
Modified: branches/release/boost/spirit/home/support/char_encoding/standard.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/char_encoding/standard.hpp (original)
+++ branches/release/boost/spirit/home/support/char_encoding/standard.hpp 2010-04-06 14:31:22 EDT (Tue, 06 Apr 2010)
@@ -27,7 +27,7 @@
static bool
isascii_(int ch)
{
- return (0 == (ch & ~0x7f)) ? true : false;
+ return 0 == (ch & ~0x7f);
}
static bool
Modified: branches/release/boost/spirit/home/support/common_terminals.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/common_terminals.hpp (original)
+++ branches/release/boost/spirit/home/support/common_terminals.hpp 2010-04-06 14:31:22 EDT (Tue, 06 Apr 2010)
@@ -17,6 +17,7 @@
#include <boost/spirit/home/support/char_encoding/standard_wide.hpp>
#include <boost/spirit/home/support/char_encoding/ascii.hpp>
#include <boost/spirit/home/support/char_encoding/iso8859_1.hpp>
+#include <boost/spirit/home/support/char_encoding/unicode.hpp>
#include <boost/spirit/home/support/char_class.hpp>
namespace boost { namespace spirit
@@ -156,5 +157,6 @@
BOOST_SPIRIT_DEFINE_CHAR_CODES(iso8859_1)
BOOST_SPIRIT_DEFINE_CHAR_CODES(standard)
BOOST_SPIRIT_DEFINE_CHAR_CODES(standard_wide)
+BOOST_SPIRIT_DEFINE_CHAR_CODES(unicode)
#endif