|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r59937 - in trunk/boost/spirit/home/classic: core/impl core/non_terminal core/non_terminal/impl error_handling phoenix tree
From: hartmut.kaiser_at_[hidden]
Date: 2010-02-25 21:25:00
Author: hkaiser
Date: 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
New Revision: 59937
URL: http://svn.boost.org/trac/boost/changeset/59937
Log:
Spirit: fixed #2304 (Patch to fix warnings in spirit)
Text files modified:
trunk/boost/spirit/home/classic/core/impl/match.ipp | 16 ++++----
trunk/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp | 2
trunk/boost/spirit/home/classic/core/non_terminal/parser_id.hpp | 2
trunk/boost/spirit/home/classic/core/non_terminal/rule.hpp | 8 ++--
trunk/boost/spirit/home/classic/core/non_terminal/subrule.hpp | 10 ++--
trunk/boost/spirit/home/classic/error_handling/exceptions.hpp | 4 +-
trunk/boost/spirit/home/classic/phoenix/actor.hpp | 70 ++++++++++++++++++++--------------------
trunk/boost/spirit/home/classic/tree/common.hpp | 20 +++++-----
8 files changed, 66 insertions(+), 66 deletions(-)
Modified: trunk/boost/spirit/home/classic/core/impl/match.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/impl/match.ipp (original)
+++ trunk/boost/spirit/home/classic/core/impl/match.ipp 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
@@ -19,12 +19,12 @@
: len(-1), val() {}
template <typename T>
- inline match<T>::match(std::size_t length)
- : len(length), val() {}
+ inline match<T>::match(std::size_t length_)
+ : len(length_), val() {}
template <typename T>
- inline match<T>::match(std::size_t length, ctor_param_t val_)
- : len(length), val(val_) {}
+ inline match<T>::match(std::size_t length_, ctor_param_t val_)
+ : len(length_), val(val_) {}
template <typename T>
inline bool
@@ -66,11 +66,11 @@
inline match<nil_t>::match()
: len(-1) {}
- inline match<nil_t>::match(std::size_t length)
- : len(length) {}
+ inline match<nil_t>::match(std::size_t length_)
+ : len(length_) {}
- inline match<nil_t>::match(std::size_t length, nil_t)
- : len(length) {}
+ inline match<nil_t>::match(std::size_t length_, nil_t)
+ : len(length_) {}
inline bool
match<nil_t>::operator!() const
Modified: trunk/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
@@ -231,7 +231,7 @@
template <typename ParserT, typename ScannerT, typename AttrT>
struct concrete_parser : abstract_parser<ScannerT, AttrT>
{
- concrete_parser(ParserT const& p) : p(p) {}
+ concrete_parser(ParserT const& p_) : p(p_) {}
virtual ~concrete_parser() {}
virtual typename match_result<ScannerT, AttrT>::type
Modified: trunk/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/parser_id.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
@@ -106,7 +106,7 @@
: parser_id(reinterpret_cast<std::size_t>(this));
}
- void set_id(parser_id id) { tag = id; }
+ void set_id(parser_id id_) { tag = id_; }
private:
Modified: trunk/boost/spirit/home/classic/core/non_terminal/rule.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/rule.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/rule.hpp 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
@@ -159,11 +159,11 @@
return ptr.get();
}
- rule(abstract_parser_t* ptr)
- : ptr(ptr) {}
+ rule(abstract_parser_t* ptr_)
+ : ptr(ptr_) {}
- rule(abstract_parser_t const* ptr)
- : ptr(ptr) {}
+ rule(abstract_parser_t const* ptr_)
+ : ptr(ptr_) {}
scoped_ptr<abstract_parser_t> ptr;
};
Modified: trunk/boost/spirit/home/classic/core/non_terminal/subrule.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/subrule.hpp (original)
+++ trunk/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
@@ -148,7 +148,7 @@
subrule_list<
subrule_parser<ID, DefT, ContextT>,
RestT> >
- operator,(subrule_parser<ID, DefT, ContextT> const& rhs)
+ operator,(subrule_parser<ID, DefT, ContextT> const& rhs_)
{
return subrule_list<
FirstT,
@@ -158,7 +158,7 @@
first,
subrule_list<
subrule_parser<ID, DefT, ContextT>,
- RestT>(rhs, rest));
+ RestT>(rhs_, rest));
}
FirstT first;
@@ -258,10 +258,10 @@
parse_main(ScannerT const& scan) const
{
typedef typename parser_result<self_t, ScannerT>::type result_t;
- result_t result;
+ result_t result_;
impl::parse_subrule<result_t, ScannerT, ID>::
- do_(result, scan);
- return result;
+ do_(result_, scan);
+ return result_;
}
template <typename ScannerT>
Modified: trunk/boost/spirit/home/classic/error_handling/exceptions.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/error_handling/exceptions.hpp (original)
+++ trunk/boost/spirit/home/classic/error_handling/exceptions.hpp 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
@@ -126,8 +126,8 @@
typedef unary<ParserT, parser<self_t> > base_t;
typedef unary_parser_category parser_category_t;
- assertive_parser(ParserT const& parser, ErrorDescrT descriptor)
- : base_t(parser), descriptor(descriptor) {}
+ assertive_parser(ParserT const& parser, ErrorDescrT descriptor_)
+ : base_t(parser), descriptor(descriptor_) {}
template <typename ScannerT>
struct result
Modified: trunk/boost/spirit/home/classic/phoenix/actor.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/phoenix/actor.hpp (original)
+++ trunk/boost/spirit/home/classic/phoenix/actor.hpp 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
@@ -349,27 +349,27 @@
template <typename BaseT>
template <typename A>
inline typename actor_result<BaseT, tuple<A&> >::type
-actor<BaseT>::operator()(A& a) const
+actor<BaseT>::operator()(A& a_) const
{
- return BaseT::eval(tuple<A&>(a));
+ return BaseT::eval(tuple<A&>(a_));
}
//////////////////////////////////
template <typename BaseT>
template <typename A, typename B>
inline typename actor_result<BaseT, tuple<A&, B&> >::type
-actor<BaseT>::operator()(A& a, B& b) const
+actor<BaseT>::operator()(A& a_, B& b_) const
{
- return BaseT::eval(tuple<A&, B&>(a, b));
+ return BaseT::eval(tuple<A&, B&>(a_, b_));
}
//////////////////////////////////
template <typename BaseT>
template <typename A, typename B, typename C>
inline typename actor_result<BaseT, tuple<A&, B&, C&> >::type
-actor<BaseT>::operator()(A& a, B& b, C& c) const
+actor<BaseT>::operator()(A& a_, B& b_, C& c_) const
{
- return BaseT::eval(tuple<A&, B&, C&>(a, b, c));
+ return BaseT::eval(tuple<A&, B&, C&>(a_, b_, c_));
}
#if PHOENIX_LIMIT > 3
@@ -377,18 +377,18 @@
template <typename BaseT>
template <typename A, typename B, typename C, typename D>
inline typename actor_result<BaseT, tuple<A&, B&, C&, D&> >::type
-actor<BaseT>::operator()(A& a, B& b, C& c, D& d) const
+actor<BaseT>::operator()(A& a_, B& b_, C& c_, D& d_) const
{
- return BaseT::eval(tuple<A&, B&, C&, D&>(a, b, c, d));
+ return BaseT::eval(tuple<A&, B&, C&, D&>(a_, b_, c_, d_));
}
//////////////////////////////////
template <typename BaseT>
template <typename A, typename B, typename C, typename D, typename E>
inline typename actor_result<BaseT, tuple<A&, B&, C&, D&, E&> >::type
-actor<BaseT>::operator()(A& a, B& b, C& c, D& d, E& e) const
+actor<BaseT>::operator()(A& a_, B& b_, C& c_, D& d_, E& e_) const
{
- return BaseT::eval(tuple<A&, B&, C&, D&, E&>(a, b, c, d, e));
+ return BaseT::eval(tuple<A&, B&, C&, D&, E&>(a_, b_, c_, d_, e_));
}
//////////////////////////////////
@@ -400,12 +400,12 @@
tuple<A&, B&, C&, D&, E&, F&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&>
- (a, b, c, d, e, f)
+ (a_, b_, c_, d_, e_, f_)
);
}
@@ -419,12 +419,12 @@
tuple<A&, B&, C&, D&, E&, F&, G&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&>
- (a, b, c, d, e, f, g)
+ (a_, b_, c_, d_, e_, f_, g_)
);
}
@@ -437,12 +437,12 @@
tuple<A&, B&, C&, D&, E&, F&, G&, H&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_, H& h_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&, H&>
- (a, b, c, d, e, f, g, h)
+ (a_, b_, c_, d_, e_, f_, g_, h_)
);
}
@@ -455,12 +455,12 @@
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h, I& i
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_, H& h_, I& i_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&>
- (a, b, c, d, e, f, g, h, i)
+ (a_, b_, c_, d_, e_, f_, g_, h_, i_)
);
}
@@ -474,12 +474,12 @@
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h, I& i, J& j
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_, H& h_, I& i_, J& j_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&>
- (a, b, c, d, e, f, g, h, i, j)
+ (a_, b_, c_, d_, e_, f_, g_, h_, i_, j_)
);
}
@@ -493,13 +493,13 @@
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h, I& i, J& j,
- K& k
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_, H& h_, I& i_, J& j_,
+ K& k_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&>
- (a, b, c, d, e, f, g, h, i, j, k)
+ (a_, b_, c_, d_, e_, f_, g_, h_, i_, j_, k_)
);
}
@@ -513,13 +513,13 @@
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&, L&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h, I& i, J& j,
- K& k, L& l
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_, H& h_, I& i_, J& j_,
+ K& k_, L& l_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&, L&>
- (a, b, c, d, e, f, g, h, i, j, k, l)
+ (a_, b_, c_, d_, e_, f_, g_, h_, i_, j_, k_, l_)
);
}
@@ -534,13 +534,13 @@
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&, L&, M&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h, I& i, J& j,
- K& k, L& l, M& m
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_, H& h_, I& i_, J& j_,
+ K& k_, L& l_, M& m_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&, L&, M&>
- (a, b, c, d, e, f, g, h, i, j, k, l, m)
+ (a_, b_, c_, d_, e_, f_, g_, h_, i_, j_, k_, l_, m_)
);
}
@@ -554,13 +554,13 @@
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&, L&, M&, N&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h, I& i, J& j,
- K& k, L& l, M& m, N& n
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_, H& h_, I& i_, J& j_,
+ K& k_, L& l_, M& m_, N& n_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&, L&, M&, N&>
- (a, b, c, d, e, f, g, h, i, j, k, l, m, n)
+ (a_, b_, c_, d_, e_, f_, g_, h_, i_, j_, k_, l_, m_, n_)
);
}
@@ -574,13 +574,13 @@
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&, L&, M&, N&, O&>
>::type
actor<BaseT>::operator()(
- A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h, I& i, J& j,
- K& k, L& l, M& m, N& n, O& o
+ A& a_, B& b_, C& c_, D& d_, E& e_, F& f_, G& g_, H& h_, I& i_, J& j_,
+ K& k_, L& l_, M& m_, N& n_, O& o_
) const
{
return BaseT::eval(
tuple<A&, B&, C&, D&, E&, F&, G&, H&, I&, J&, K&, L&, M&, N&, O&>
- (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
+ (a_, b_, c_, d_, e_, f_, g_, h_, i_, j_, k_, l_, m_, n_, o_)
);
}
Modified: trunk/boost/spirit/home/classic/tree/common.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/tree/common.hpp (original)
+++ trunk/boost/spirit/home/classic/tree/common.hpp 2010-02-25 21:24:59 EST (Thu, 25 Feb 2010)
@@ -555,18 +555,18 @@
{}
explicit
- tree_match(std::size_t length)
- : match<T>(length), trees()
+ tree_match(std::size_t length_)
+ : match<T>(length_), trees()
{}
- tree_match(std::size_t length, parse_node_t const& n)
- : match<T>(length), trees()
+ tree_match(std::size_t length_, parse_node_t const& n)
+ : match<T>(length_), trees()
{
trees.push_back(node_t(n));
}
- tree_match(std::size_t length, param_type val, parse_node_t const& n)
- : match<T>(length, val), trees()
+ tree_match(std::size_t length_, param_type val, parse_node_t const& n)
+ : match<T>(length_, val), trees()
{
#if !defined(BOOST_SPIRIT_USE_LIST_FOR_TREES)
trees.reserve(10); // this is more or less an arbitrary number...
@@ -575,14 +575,14 @@
}
// attention, these constructors will change the second parameter!
- tree_match(std::size_t length, container_t& c)
- : match<T>(length), trees()
+ tree_match(std::size_t length_, container_t& c)
+ : match<T>(length_), trees()
{
impl::cp_swap(trees, c);
}
- tree_match(std::size_t length, param_type val, container_t& c)
- : match<T>(length, val), trees()
+ tree_match(std::size_t length_, param_type val, container_t& c)
+ : match<T>(length_, val), trees()
{
impl::cp_swap(trees, c);
}
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