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

cleanup include directives

Browse source
This commit is contained in:
artemp 2016-12-08 18:55:55 +01:00
parent 1372ca48ef
commit 0d703ee552
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/json/feature_generator_grammar_impl.hpp
View file

@ -22,11 +22,6 @@
#include <mapnik/json/feature_generator_grammar.hpp> #include <mapnik/json/feature_generator_grammar.hpp>
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/fusion/include/at.hpp>
namespace mapnik { namespace json { namespace mapnik { namespace json {
template <typename OutputIterator, typename FeatureType> template <typename OutputIterator, typename FeatureType>

14
include/mapnik/json/properties_generator_grammar_impl.hpp
View file

@ -26,8 +26,6 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/include/phoenix.hpp> #include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/fusion/include/at.hpp>
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
@ -60,7 +58,7 @@ escaped_string<OutputIterator>::escaped_string()
} }
template <typename OutputIterator, typename KeyValueStore> template <typename OutputIterator, typename KeyValueStore>
properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator_grammar() properties_generator_grammar<OutputIterator, KeyValueStore>::properties_generator_grammar()
: properties_generator_grammar::base_type(properties), : properties_generator_grammar::base_type(properties),
quote_("\"") quote_("\"")
{ {
@ -71,14 +69,13 @@ properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator
boost::spirit::karma::string_type kstring; boost::spirit::karma::string_type kstring;
boost::spirit::karma::eps_type eps; boost::spirit::karma::eps_type eps;
using boost::phoenix::at_c; using boost::phoenix::at_c;
properties = lit('{') properties = lit('{')
<< -(pair % lit(',')) << -(pair % lit(','))
<< lit('}') << lit('}')
; ;
pair = lit('"') pair = lit('"')
<< kstring[_1 = boost::phoenix::at_c<0>(_val)] << lit('"') << kstring[_1 = at_c<0>(_val)] << lit('"')
<< lit(':') << lit(':')
<< value[_1 = extract_string_(at_c<1>(_val))] << value[_1 = extract_string_(at_c<1>(_val))]
; ;
@ -88,13 +85,6 @@ properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator
kstring[_1 = at_c<0>(_val)] kstring[_1 = at_c<0>(_val)]
; ;
// FIXME http://boost-spirit.com/home/articles/karma-examples/creating-your-own-generator-component-for-spirit-karma/
//value = (value_null_| bool_ | int__ | double_ | ustring)//[_1 = value_base_(_r1)]
// ;
//value_null_ = kstring[_1 = "null"]
// ;
//ustring = escaped_string_(quote_.c_str())[_1 = utf8_(_val)]
// ;
} }
}} }}