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

fix compile of (currently unsed) symbolizer_grammar.hpp

Browse source
This commit is contained in:
Dane Springmeyer 2014-09-30 12:12:58 -07:00
parent 6be1eb94c2
commit 985ddb3aeb
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/mapnik/json/symbolizer_grammar.hpp
View file

@ -23,6 +23,8 @@
#ifndef MAPNIK_SYMBOLIZER_GRAMMAR_HPP #ifndef MAPNIK_SYMBOLIZER_GRAMMAR_HPP
#define MAPNIK_SYMBOLIZER_GRAMMAR_HPP #define MAPNIK_SYMBOLIZER_GRAMMAR_HPP
#include <mapnik/config.hpp>
// boost // boost
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix.hpp> #include <boost/spirit/include/phoenix.hpp>
@ -122,21 +124,15 @@ struct symbolizer_grammar : qi::grammar<Iterator, space_type, symbolizer()>
: symbolizer_grammar::base_type(sym, "symbolizer"), : symbolizer_grammar::base_type(sym, "symbolizer"),
json_() json_()
{ {
using qi::lit; qi::lit_type lit;
using qi::double_; qi::double_type double_;
using qi::int_; qi::int_type int_;
using qi::no_skip; qi::no_skip_type no_skip;
using qi::omit; qi::_val_type _val;
using qi::_val; qi::_a_type _a;
using qi::_a; qi::_r1_type _r1;
using qi::_r1; qi::_1_type _1;
using qi::_1; standard_wide::char_type char_;
using qi::_2;
using qi::_3;
using qi::_4;
using qi::fail;
using qi::on_error;
using standard_wide::char_;
using phoenix::construct; using phoenix::construct;
// generic json types // generic json types
@ -197,7 +193,7 @@ struct symbolizer_grammar : qi::grammar<Iterator, space_type, symbolizer()>
property = (json_.string_ [_a = _1] >> lit(':') >> property_value [put_property_(_r1,_a,_1)]) % lit(',') property = (json_.string_ [_a = _1] >> lit(':') >> property_value [put_property_(_r1,_a,_1)]) % lit(',')
; ;
property_value %= json.number | json.string_ ; property_value %= json_.number | json_.string_ ;
} }
@ -211,7 +207,7 @@ struct symbolizer_grammar : qi::grammar<Iterator, space_type, symbolizer()>
phoenix::function<put_property> put_property_; phoenix::function<put_property> put_property_;
// error // error
on_error<fail>(sym, error_handler(_1, _2, _3, _4)); //qi::on_error<qi::fail>(sym, error_handler(_1, _2, _3, _4));
}; };