|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r57475 - in branches/release: boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/karma/detail boost/spirit/home/karma/operator boost/spirit/home/qi/auxiliary boost/spirit/home/qi/detail boost/spirit/home/qi/directive boost/spirit/home/qi/nonterminal boost/spirit/home/qi/numeric boost/spirit/home/qi/numeric/detail boost/spirit/home/qi/operator boost/spirit/home/support boost/spirit/include boost/spirit/repository/home/qi/nonterminal libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/doc/html/spirit/abstracts/customize libs/spirit/doc/html/spirit/abstracts/indepth libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/lex libs/spirit/test/qi
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-07 18:14:32
Author: hkaiser
Date: 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
New Revision: 57475
URL: http://svn.boost.org/trac/boost/changeset/57475
Log:
Spirit: merging fixes for warnings and missing header #include's from trunk
Removed:
branches/release/boost/spirit/include/qi_phoenix_attributes.hpp
Properties modified:
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/qi/nonterminal/rule.hpp (props changed)
branches/release/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp (props changed)
branches/release/boost/spirit/home/support/attributes.hpp (contents, props changed)
branches/release/boost/spirit/repository/home/qi/nonterminal/subrule.hpp (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/doc/html/spirit/abstracts/customize/ (props changed)
branches/release/libs/spirit/doc/html/spirit/abstracts/indepth/ (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)
Text files modified:
branches/release/boost/spirit/home/karma/detail/alternative_function.hpp | 1 +
branches/release/boost/spirit/home/karma/operator/list.hpp | 1 +
branches/release/boost/spirit/home/qi/auxiliary/eoi.hpp | 1 +
branches/release/boost/spirit/home/qi/auxiliary/eol.hpp | 1 +
branches/release/boost/spirit/home/qi/detail/assign_to.hpp | 4 ++--
branches/release/boost/spirit/home/qi/directive/omit.hpp | 1 +
branches/release/boost/spirit/home/qi/directive/raw.hpp | 1 +
branches/release/boost/spirit/home/qi/numeric/numeric_utils.hpp | 1 +
branches/release/boost/spirit/home/qi/operator/permutation.hpp | 3 ++-
branches/release/boost/spirit/home/qi/operator/sequential_or.hpp | 1 +
branches/release/boost/spirit/home/support/attributes.hpp | 2 +-
branches/release/libs/spirit/test/lex/set_token_value.cpp | 4 ++--
12 files changed, 15 insertions(+), 6 deletions(-)
Modified: branches/release/boost/spirit/home/karma/detail/alternative_function.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/detail/alternative_function.hpp (original)
+++ branches/release/boost/spirit/home/karma/detail/alternative_function.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -16,6 +16,7 @@
#include <boost/spirit/home/support/attributes.hpp>
#include <boost/spirit/home/support/detail/hold_any.hpp>
#include <boost/spirit/home/karma/detail/output_iterator.hpp>
+#include <boost/spirit/home/support/container.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/mpl/find_if.hpp>
#include <boost/mpl/deref.hpp>
Modified: branches/release/boost/spirit/home/karma/operator/list.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/operator/list.hpp (original)
+++ branches/release/boost/spirit/home/karma/operator/list.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -14,6 +14,7 @@
#include <boost/spirit/home/karma/domain.hpp>
#include <boost/spirit/home/karma/generator.hpp>
#include <boost/spirit/home/karma/meta_compiler.hpp>
+#include <boost/spirit/home/karma/detail/output_iterator.hpp>
#include <boost/spirit/home/support/info.hpp>
#include <boost/spirit/home/support/unused.hpp>
#include <boost/spirit/home/support/container.hpp>
Modified: branches/release/boost/spirit/home/qi/auxiliary/eoi.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/auxiliary/eoi.hpp (original)
+++ branches/release/boost/spirit/home/qi/auxiliary/eoi.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -16,6 +16,7 @@
#include <boost/spirit/home/qi/domain.hpp>
#include <boost/spirit/home/qi/parser.hpp>
#include <boost/spirit/home/qi/meta_compiler.hpp>
+#include <boost/spirit/home/qi/skip_over.hpp>
#include <boost/spirit/home/support/common_terminals.hpp>
namespace boost { namespace spirit
Modified: branches/release/boost/spirit/home/qi/auxiliary/eol.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/auxiliary/eol.hpp (original)
+++ branches/release/boost/spirit/home/qi/auxiliary/eol.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -16,6 +16,7 @@
#include <boost/spirit/home/qi/domain.hpp>
#include <boost/spirit/home/qi/parser.hpp>
#include <boost/spirit/home/qi/meta_compiler.hpp>
+#include <boost/spirit/home/qi/skip_over.hpp>
#include <boost/spirit/home/support/common_terminals.hpp>
namespace boost { namespace spirit
Modified: branches/release/boost/spirit/home/qi/detail/assign_to.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/detail/assign_to.hpp (original)
+++ branches/release/boost/spirit/home/qi/detail/assign_to.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -69,7 +69,7 @@
static void
call(T const& val, Attribute& attr)
{
- attr = val;
+ attr = static_cast<Attribute>(val);
}
};
@@ -79,7 +79,7 @@
static void
call(T const& val, reference_wrapper<Attribute> attr)
{
- attr = val;
+ attr = static_cast<Attribute>(val.get());
}
};
Modified: branches/release/boost/spirit/home/qi/directive/omit.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/directive/omit.hpp (original)
+++ branches/release/boost/spirit/home/qi/directive/omit.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -17,6 +17,7 @@
#include <boost/spirit/home/support/unused.hpp>
#include <boost/spirit/home/support/info.hpp>
#include <boost/spirit/home/support/common_terminals.hpp>
+#include <boost/spirit/home/support/has_semantic_action.hpp>
namespace boost { namespace spirit
{
Modified: branches/release/boost/spirit/home/qi/directive/raw.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/directive/raw.hpp (original)
+++ branches/release/boost/spirit/home/qi/directive/raw.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -19,6 +19,7 @@
#include <boost/spirit/home/support/info.hpp>
#include <boost/spirit/home/support/common_terminals.hpp>
#include <boost/spirit/home/support/unused.hpp>
+#include <boost/spirit/home/support/has_semantic_action.hpp>
#include <boost/range/iterator_range.hpp>
namespace boost { namespace spirit
Modified: branches/release/boost/spirit/home/qi/numeric/numeric_utils.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/numeric/numeric_utils.hpp (original)
+++ branches/release/boost/spirit/home/qi/numeric/numeric_utils.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -12,6 +12,7 @@
#endif
#include <boost/spirit/home/support/assert_msg.hpp>
+#include <boost/spirit/home/qi/detail/assign_to.hpp>
#include <boost/spirit/home/qi/numeric/detail/numeric_utils.hpp>
#include <boost/assert.hpp>
#include <boost/mpl/assert.hpp>
Modified: branches/release/boost/spirit/home/qi/operator/permutation.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/operator/permutation.hpp (original)
+++ branches/release/boost/spirit/home/qi/operator/permutation.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -11,6 +11,7 @@
#pragma once
#endif
+#include <boost/spirit/home/qi/meta_compiler.hpp>
#include <boost/spirit/home/qi/detail/permute_function.hpp>
#include <boost/spirit/home/support/attributes.hpp>
#include <boost/spirit/home/support/algorithm/any_if_ns.hpp>
@@ -38,7 +39,7 @@
namespace boost { namespace spirit { namespace qi
{
template <typename Elements>
- struct permutation : nary_parser<alternative<Elements> >
+ struct permutation : nary_parser<permutation<Elements> >
{
template <typename Context, typename Iterator>
struct attribute
Modified: branches/release/boost/spirit/home/qi/operator/sequential_or.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/operator/sequential_or.hpp (original)
+++ branches/release/boost/spirit/home/qi/operator/sequential_or.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -11,6 +11,7 @@
#pragma once
#endif
+#include <boost/spirit/home/qi/meta_compiler.hpp>
#include <boost/spirit/home/qi/detail/pass_function.hpp>
#include <boost/spirit/home/support/attributes.hpp>
#include <boost/spirit/home/support/detail/what_function.hpp>
Modified: branches/release/boost/spirit/home/support/attributes.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/attributes.hpp (original)
+++ branches/release/boost/spirit/home/support/attributes.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -506,7 +506,7 @@
///////////////////////////////////////////////////////////////////////////
template <typename Transformed, typename Exposed>
typename spirit::result_of::pre_transform<Exposed, Transformed>::type
- pre_transform(Exposed& attr)
+ pre_transform(Exposed& attr BOOST_PROTO_DISABLE_IF_IS_CONST(Exposed))
{
return transform_attribute<Exposed, Transformed>::pre(attr);
}
Deleted: branches/release/boost/spirit/include/qi_phoenix_attributes.hpp
==============================================================================
--- branches/release/boost/spirit/include/qi_phoenix_attributes.hpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
+++ (empty file)
@@ -1,18 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2009 Joel de Guzman
- Copyright (c) 2001-2009 Hartmut Kaiser
- http://spirit.sourceforge.net/
-
- 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)
-=============================================================================*/
-#ifndef BOOST_SPIRIT_INCLUDE_QI_PHOENIX_ATTRIBUTES
-#define BOOST_SPIRIT_INCLUDE_QI_PHOENIX_ATTRIBUTES
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#include <boost/spirit/home/qi/phoenix_attributes.hpp>
-
-#endif
Modified: branches/release/libs/spirit/test/lex/set_token_value.cpp
==============================================================================
--- branches/release/libs/spirit/test/lex/set_token_value.cpp (original)
+++ branches/release/libs/spirit/test/lex/set_token_value.cpp 2009-11-07 18:14:31 EST (Sat, 07 Nov 2009)
@@ -121,7 +121,7 @@
return false; // reached end of expected data
typename Token::token_value_type const& value (t.value());
- if (t.id() != d->id) // token id must match
+ if (t.id() != static_cast<std::size_t>(d->id)) // token id must match
return false;
if (value.which() != 1) // must have an integer value
return false;
@@ -140,7 +140,7 @@
{
if (*i == -1)
return false; // reached end of expected data
- if (indents.top() != *i)
+ if (indents.top() != static_cast<unsigned int>(*i))
return false; // value must match
++i;
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