|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70483 - in trunk/boost/spirit/home: karma/auxiliary karma/detail lex lex/lexer lex/lexer/lexertl qi/auxiliary qi/detail qi/nonterminal support support/iterators/detail support/utree
From: hartmut.kaiser_at_[hidden]
Date: 2011-03-23 12:52:02
Author: hkaiser
Date: 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
New Revision: 70483
URL: http://svn.boost.org/trac/boost/changeset/70483
Log:
Spirit: fixing warnings, etc.
Text files modified:
trunk/boost/spirit/home/karma/auxiliary/lazy.hpp | 2 +-
trunk/boost/spirit/home/karma/detail/extract_from.hpp | 2 +-
trunk/boost/spirit/home/lex/argument.hpp | 7 +++----
trunk/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp | 4 +++-
trunk/boost/spirit/home/lex/lexer/string_token_def.hpp | 2 +-
trunk/boost/spirit/home/qi/auxiliary/lazy.hpp | 2 +-
trunk/boost/spirit/home/qi/detail/assign_to.hpp | 1 -
trunk/boost/spirit/home/qi/detail/attributes.hpp | 4 ++--
trunk/boost/spirit/home/qi/nonterminal/simple_trace.hpp | 2 +-
trunk/boost/spirit/home/support/attributes.hpp | 2 +-
trunk/boost/spirit/home/support/container.hpp | 2 +-
trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp | 6 +++---
trunk/boost/spirit/home/support/lazy.hpp | 2 +-
trunk/boost/spirit/home/support/utree/utree_traits.hpp | 4 ++--
14 files changed, 21 insertions(+), 21 deletions(-)
Modified: trunk/boost/spirit/home/karma/auxiliary/lazy.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/auxiliary/lazy.hpp (original)
+++ trunk/boost/spirit/home/karma/auxiliary/lazy.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -18,7 +18,7 @@
#include <boost/spirit/home/support/unused.hpp>
#include <boost/spirit/home/support/info.hpp>
#include <boost/spirit/home/support/lazy.hpp>
-#include <boost/spirit/home/phoenix/core/actor.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/fusion/include/at.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/type_traits/remove_reference.hpp>
Modified: trunk/boost/spirit/home/karma/detail/extract_from.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/detail/extract_from.hpp (original)
+++ trunk/boost/spirit/home/karma/detail/extract_from.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -10,7 +10,7 @@
#pragma once
#endif
-#include <boost/spirit/home/phoenix/core/actor.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/home/support/unused.hpp>
#include <boost/spirit/home/support/attributes_fwd.hpp>
#include <boost/spirit/home/karma/detail/attributes.hpp>
Modified: trunk/boost/spirit/home/lex/argument.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/argument.hpp (original)
+++ trunk/boost/spirit/home/lex/argument.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -31,7 +31,7 @@
///////////////////////////////////////////////////////////////////////////
// The state_getter is a Phoenix actor used to access the name of the
// current lexer state by calling get_state_name() on the context (which
- // is the 4th parameter to any lexer semantic actions).
+ // is the 5th parameter to any lexer semantic actions).
//
// This Phoenix actor is invoked whenever the placeholder '_state' is used
// as a rvalue inside a lexer semantic action:
@@ -68,7 +68,7 @@
///////////////////////////////////////////////////////////////////////////
// The state_setter is a Phoenix actor used to change the name of the
// current lexer state by calling set_state_name() on the context (which
- // is the 4th parameter to any lexer semantic actions).
+ // is the 5th parameter to any lexer semantic actions).
//
// This Phoenix actor is invoked whenever the placeholder '_state' is used
// as a lvalue inside a lexer semantic action:
@@ -179,7 +179,7 @@
///////////////////////////////////////////////////////////////////////////
// The value_setter is a Phoenix actor used to change the name of the
// current lexer state by calling set_state_name() on the context (which
- // is the 4th parameter to any lexer semantic actions).
+ // is the 5th parameter to any lexer semantic actions).
//
// This Phoenix actor is invoked whenever the placeholder '_val' is used
// as a lvalue inside a lexer semantic action:
@@ -381,7 +381,6 @@
// to its real, second argument (the RHS actor).
typedef spirit::lex::value_setter<typename as_actor<RHS>::type> type;
};
-
}}
#undef SPIRIT_DECLARE_ARG
Modified: trunk/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp (original)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -318,7 +318,9 @@
: base_type(data, first, last)
, actions_(data.actions_), hold_()
, value_(iterator_range<Iterator>(first, last))
- , has_hold_(false), has_value_(false) {}
+ , has_value_(false)
+ , has_hold_(false)
+ {}
// invoke attached semantic actions, if defined
BOOST_SCOPED_ENUM(pass_flags) invoke_actions(std::size_t state
Modified: trunk/boost/spirit/home/lex/lexer/string_token_def.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/string_token_def.hpp (original)
+++ trunk/boost/spirit/home/lex/lexer/string_token_def.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -134,7 +134,7 @@
result_type operator()(
typename add_reference<const_string>::type str, unused_type) const
{
- return result_type(str);
+ return result_type(str, std::size_t(~0));
}
};
Modified: trunk/boost/spirit/home/qi/auxiliary/lazy.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/auxiliary/lazy.hpp (original)
+++ trunk/boost/spirit/home/qi/auxiliary/lazy.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -18,7 +18,7 @@
#include <boost/spirit/home/support/unused.hpp>
#include <boost/spirit/home/support/info.hpp>
#include <boost/spirit/home/support/lazy.hpp>
-#include <boost/spirit/home/phoenix/core/actor.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/fusion/include/at.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/type_traits/remove_reference.hpp>
Modified: trunk/boost/spirit/home/qi/detail/assign_to.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/detail/assign_to.hpp (original)
+++ trunk/boost/spirit/home/qi/detail/assign_to.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -17,7 +17,6 @@
#include <boost/spirit/home/support/unused.hpp>
#include <boost/spirit/home/qi/detail/attributes.hpp>
#include <boost/spirit/home/support/container.hpp>
-#include <boost/spirit/home/phoenix/core/actor.hpp>
#include <boost/fusion/include/copy.hpp>
#include <boost/ref.hpp>
#include <boost/range/iterator_range.hpp>
Modified: trunk/boost/spirit/home/qi/detail/attributes.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/detail/attributes.hpp (original)
+++ trunk/boost/spirit/home/qi/detail/attributes.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -20,7 +20,7 @@
{
typedef Transformed type;
- static Transformed pre(Exposed& val) { return Transformed(); }
+ static Transformed pre(Exposed&) { return Transformed(); }
static void post(Exposed& val, Transformed const& attr)
{
@@ -47,7 +47,7 @@
typedef Transformed type;
static Transformed pre(Exposed& val) { return Transformed(val); }
- static void post(Exposed& val, Transformed const& attr) { /* no-op */ }
+ static void post(Exposed&, Transformed const&) { /* no-op */ }
// fail() will be called by Qi rule's if the rhs failed parsing
static void fail(Exposed&) {}
Modified: trunk/boost/spirit/home/qi/nonterminal/simple_trace.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/nonterminal/simple_trace.hpp (original)
+++ trunk/boost/spirit/home/qi/nonterminal/simple_trace.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -66,7 +66,7 @@
template <typename Iterator>
void print_some(
char const* tag
- , int indent
+ , int /*indent*/
, Iterator first, Iterator const& last) const
{
print_indent(get_indent());
Modified: trunk/boost/spirit/home/support/attributes.hpp
==============================================================================
--- trunk/boost/spirit/home/support/attributes.hpp (original)
+++ trunk/boost/spirit/home/support/attributes.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -1162,7 +1162,7 @@
}
template <typename Out>
- inline void print_attribute(Out& out, unused_type)
+ inline void print_attribute(Out&, unused_type)
{
}
Modified: trunk/boost/spirit/home/support/container.hpp
==============================================================================
--- trunk/boost/spirit/home/support/container.hpp (original)
+++ trunk/boost/spirit/home/support/container.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -369,7 +369,7 @@
template <typename Container, typename Enable/* = void*/>
struct make_container_attribute
{
- static void call(Container& c)
+ static void call(Container&)
{
// for static types this function does nothing
}
Modified: trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp (original)
+++ trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -95,7 +95,7 @@
: Ownership, Checking, Storage
{
multi_pass_unique() {}
- multi_pass_unique(T const& x) {}
+ multi_pass_unique(T const&) {}
template <typename MultiPass>
static void destroy(MultiPass& mp)
@@ -173,7 +173,7 @@
: Ownership, Storage
{
multi_pass_unique() {}
- multi_pass_unique(T const& x) {}
+ multi_pass_unique(T const&) {}
template <typename MultiPass>
static void destroy(MultiPass& mp)
@@ -262,7 +262,7 @@
: Checking, Storage
{
multi_pass_unique() {}
- multi_pass_unique(T const& x) {}
+ multi_pass_unique(T const&) {}
template <typename MultiPass>
static void destroy(MultiPass& mp)
Modified: trunk/boost/spirit/home/support/lazy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/lazy.hpp (original)
+++ trunk/boost/spirit/home/support/lazy.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -11,8 +11,8 @@
#pragma once
#endif
+#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/proto/proto.hpp>
-#include <boost/spirit/home/phoenix/core/actor.hpp>
#include <boost/spirit/home/support/modify.hpp>
namespace boost { namespace spirit
Modified: trunk/boost/spirit/home/support/utree/utree_traits.hpp
==============================================================================
--- trunk/boost/spirit/home/support/utree/utree_traits.hpp (original)
+++ trunk/boost/spirit/home/support/utree/utree_traits.hpp 2011-03-23 12:51:58 EDT (Wed, 23 Mar 2011)
@@ -711,7 +711,7 @@
typename IteratorA, typename IteratorB, typename Context
, typename T1, typename T2, typename T3, typename T4>
struct handles_container<karma::rule<IteratorA, T1, T2, T3, T4>
- , utree, Context, IteratorB>
+ , utree, Context, IteratorB>
: detail::handles_utree_container<typename attribute_of<
karma::rule<IteratorA, T1, T2, T3, T4>, Context, IteratorB
>::type>
@@ -721,7 +721,7 @@
typename IteratorA, typename IteratorB, typename Context
, typename T1, typename T2, typename T3, typename T4>
struct handles_container<karma::grammar<IteratorA, T1, T2, T3, T4>
- , utree, Context, IteratorB>
+ , utree, Context, IteratorB>
: detail::handles_utree_container<typename attribute_of<
karma::grammar<IteratorA, T1, T2, T3, T4>, Context, IteratorB
>::type>
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