diff options
Diffstat (limited to 'boost/spirit/repository/home/qi/directive')
4 files changed, 20 insertions, 10 deletions
diff --git a/boost/spirit/repository/home/qi/directive/confix.hpp b/boost/spirit/repository/home/qi/directive/confix.hpp index d51b0011af..80118c7720 100644 --- a/boost/spirit/repository/home/qi/directive/confix.hpp +++ b/boost/spirit/repository/home/qi/directive/confix.hpp @@ -46,8 +46,10 @@ namespace boost { namespace spirit /////////////////////////////////////////////////////////////////////////////// namespace boost { namespace spirit { namespace repository { namespace qi { - using repository::confix_type; +#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS using repository::confix; +#endif + using repository::confix_type; /////////////////////////////////////////////////////////////////////////// // the confix() generated parser diff --git a/boost/spirit/repository/home/qi/directive/distinct.hpp b/boost/spirit/repository/home/qi/directive/distinct.hpp index 740694559e..fc6bd5f307 100644 --- a/boost/spirit/repository/home/qi/directive/distinct.hpp +++ b/boost/spirit/repository/home/qi/directive/distinct.hpp @@ -56,8 +56,10 @@ namespace boost { namespace spirit /////////////////////////////////////////////////////////////////////////////// namespace boost { namespace spirit { namespace repository {namespace qi { - using repository::distinct_type; +#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS using repository::distinct; +#endif + using repository::distinct_type; template <typename Subject, typename Tail, typename Modifier> struct distinct_parser diff --git a/boost/spirit/repository/home/qi/directive/kwd.hpp b/boost/spirit/repository/home/qi/directive/kwd.hpp index 98f49409ba..e7338df432 100644 --- a/boost/spirit/repository/home/qi/directive/kwd.hpp +++ b/boost/spirit/repository/home/qi/directive/kwd.hpp @@ -16,13 +16,13 @@ #include <boost/spirit/home/qi/parser.hpp> #include <boost/spirit/home/qi/auxiliary/lazy.hpp> #include <boost/spirit/home/qi/operator/kleene.hpp> +#include <boost/spirit/home/qi/string/lit.hpp> #include <boost/spirit/home/support/container.hpp> #include <boost/spirit/home/qi/detail/attributes.hpp> #include <boost/spirit/home/qi/detail/fail_function.hpp> #include <boost/spirit/home/support/info.hpp> #include <boost/spirit/repository/home/support/kwd.hpp> #include <boost/fusion/include/at.hpp> -#include <boost/foreach.hpp> #include <vector> namespace boost { namespace spirit @@ -148,11 +148,17 @@ namespace boost { namespace spirit namespace boost { namespace spirit { namespace repository { namespace qi { +#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS using repository::kwd; using repository::ikwd; using repository::dkwd; using repository::idkwd; using spirit::inf; +#endif + using repository::kwd_type; + using repository::ikwd_type; + using repository::dkwd_type; + using repository::idkwd_type; using spirit::inf_type; template <typename T> @@ -160,7 +166,7 @@ template <typename T> { kwd_pass_iterator() {} bool flag_init() const { return true; } - bool register_successful_parse(bool &flag,T &i) const { + bool register_successful_parse(bool &flag,T &/*i*/) const { flag=true; return true; } @@ -650,7 +656,7 @@ namespace boost { namespace spirit { namespace qi ); } template <typename Terminal> - result_type create_kwd(Terminal const &term, Subject const & subject, Modifiers const& modifiers, boost::mpl::true_ ) const + result_type create_kwd(Terminal const &term, Subject const & subject, Modifiers const& /*modifiers*/, boost::mpl::true_ ) const { return create_kwd_string(term,subject,no_case()); } @@ -721,7 +727,7 @@ namespace boost { namespace spirit { namespace qi ); } template <typename Terminal> - result_type create_kwd(Terminal const &term, Subject const & subject, Modifiers const& modifiers, boost::mpl::true_ ) const + result_type create_kwd(Terminal const &term, Subject const & subject, Modifiers const& /*modifiers*/, boost::mpl::true_ ) const { return create_kwd_string(term,subject,no_case()); } @@ -896,7 +902,7 @@ namespace boost { namespace spirit { namespace qi template <typename Terminal> result_type operator()( - Terminal const& term, Subject const& subject, Modifiers const& modifiers) const + Terminal const& term, Subject const& subject, Modifiers const& /*modifiers*/) const { typename spirit::detail::get_encoding<Modifiers, spirit::char_encoding::standard>::type encoding; @@ -919,7 +925,7 @@ namespace boost { namespace spirit { namespace qi template <typename Terminal> result_type operator()( - Terminal const& term, Subject const& subject, Modifiers const& modifiers) const + Terminal const& term, Subject const& subject, Modifiers const& /*modifiers*/) const { typename spirit::detail::get_encoding<Modifiers, spirit::char_encoding::standard>::type encoding; diff --git a/boost/spirit/repository/home/qi/directive/seek.hpp b/boost/spirit/repository/home/qi/directive/seek.hpp index 951a337cbe..34bdd83892 100644 --- a/boost/spirit/repository/home/qi/directive/seek.hpp +++ b/boost/spirit/repository/home/qi/directive/seek.hpp @@ -1,9 +1,9 @@ -/*////////////////////////////////////////////////////////////////////////////// +/*============================================================================= Copyright (c) 2011 Jamboree 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_REPOSITORY_QI_SEEK #define BOOST_SPIRIT_REPOSITORY_QI_SEEK |