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

Merge branch 'master' into mapnik-geometry

Browse source
This commit is contained in:
artemp 2015-04-13 12:47:41 +02:00
commit 41aa591878
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/json/generic_json.hpp
View file

@ -57,8 +57,7 @@ struct unicode_string : qi::grammar<Iterator, std::string()>
struct push_utf8 struct push_utf8
{ {
template <typename S, typename C> typedef void result_type;
struct result { typedef void type; };
void operator()(std::string& utf8, uchar code_point) const void operator()(std::string& utf8, uchar code_point) const
{ {
@ -71,8 +70,7 @@ struct push_utf8
struct push_esc struct push_esc
{ {
template <typename S, typename C> typedef void result_type;
struct result { typedef void type; };
void operator()(std::string& utf8, uchar c) const void operator()(std::string& utf8, uchar c) const
{ {