sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

define BOOST_SPIRIT_INSTANTIATE_UNUSED once and re-use [skip-ci]

Browse source
This commit is contained in:
Artem Pavlenko 2018-04-18 14:18:19 +02:00
parent 664d3508de
commit b7bdd08837
3 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
include/mapnik/boost_spirit_instantiate.hpp Normal file
View file

@ -0,0 +1,39 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2018 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef MAPNIK_BOOST_SPIRIT_INSTANTIATE_HPP
#define MAPNIK_BOOST_SPIRIT_INSTANTIATE_HPP
namespace boost { namespace spirit { namespace x3
{
// helper macro
#define BOOST_SPIRIT_INSTANTIATE_UNUSED(rule_type, Iterator, Context) \
template bool parse_rule<Iterator, Context, boost::spirit::x3::unused_type const>( \
rule_type rule_ \
, Iterator& first, Iterator const& last \
, Context const& context, boost::spirit::x3::unused_type const& ); \
/***/
}}}
#endif // MAPNIK_BOOST_SPIRIT_INSTANTIATE_HPP

9
include/mapnik/json/json_grammar_config.hpp
View file

@ -33,6 +33,7 @@
#include <boost/bimap/unordered_set_of.hpp> #include <boost/bimap/unordered_set_of.hpp>
#include <boost/assign/list_of.hpp> #include <boost/assign/list_of.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#include <mapnik/boost_spirit_instantiate.hpp>
namespace mapnik { namespace json { namespace mapnik { namespace json {
@ -108,14 +109,6 @@ using feature_context_const_type = x3::context<feature_tag,
mapnik::transcoder const, mapnik::transcoder const,
phrase_parse_context_type>>; phrase_parse_context_type>>;
// helper macro
#define BOOST_SPIRIT_INSTANTIATE_UNUSED(rule_type, Iterator, Context) \
template bool parse_rule<Iterator, Context, boost::spirit::x3::unused_type const>( \
rule_type rule_ \
, Iterator& first, Iterator const& last \
, Context const& context, boost::spirit::x3::unused_type const& ); \
/***/
}}} }}}
#endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP #endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP

8
src/svg/svg_path_grammar_x3.cpp
View file

@ -21,16 +21,10 @@
*****************************************************************************/ *****************************************************************************/
#include <mapnik/svg/svg_path_grammar_x3_def.hpp> #include <mapnik/svg/svg_path_grammar_x3_def.hpp>
#include <mapnik/boost_spirit_instantiate.hpp>
namespace mapnik { namespace svg { namespace grammar { namespace mapnik { namespace svg { namespace grammar {
#define BOOST_SPIRIT_INSTANTIATE_UNUSED(rule_type, Iterator, Context) \
template bool parse_rule<Iterator, Context, boost::spirit::x3::unused_type const>( \
rule_type rule_ \
, Iterator& first, Iterator const& last \
, Context const& context, boost::spirit::x3::unused_type const& ); \
/***/
BOOST_SPIRIT_INSTANTIATE_UNUSED(svg_path_grammar_type, iterator_type, svg_parse_context_type); BOOST_SPIRIT_INSTANTIATE_UNUSED(svg_path_grammar_type, iterator_type, svg_parse_context_type);
BOOST_SPIRIT_INSTANTIATE_UNUSED(svg_points_grammar_type, iterator_type, svg_parse_context_type); BOOST_SPIRIT_INSTANTIATE_UNUSED(svg_points_grammar_type, iterator_type, svg_parse_context_type);