Merge pull request #2749 from mapycz/fix-compile-json-grammar

Dane Springmeyer · Dane Springmeyer · commit fc9117929827 · 2015-04-06T21:04:52.000-04:00
fix compile json grammar with boost 1.49
diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
@@ -57,8 +57,7 @@ struct unicode_string : qi::grammar<Iterator, std::string()>
 
 struct push_utf8
 {
-    template <typename S, typename C>
-    struct result { typedef void type; };
+    typedef void result_type;
 
     void operator()(std::string& utf8, uchar code_point) const
     {
@@ -71,8 +70,7 @@ struct push_utf8
 
 struct push_esc
 {
-    template <typename S, typename C>
-    struct result { typedef void type; };
+    typedef void result_type;
 
     void operator()(std::string& utf8, uchar c) const
     {

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@ struct unicode_string : qi::grammar<Iterator, std::string()>`
`57`	`57`
`58`	`58`	`struct push_utf8`
`59`	`59`	`{`
`60`		`- template <typename S, typename C>`
`61`		`- struct result { typedef void type; };`
	`60`	`+ typedef void result_type;`
`62`	`61`
`63`	`62`	`void operator()(std::string& utf8, uchar code_point) const`
`64`	`63`	`{`
`@@ -71,8 +70,7 @@ struct push_utf8`
`71`	`70`
`72`	`71`	`struct push_esc`
`73`	`72`	`{`
`74`		`- template <typename S, typename C>`
`75`		`- struct result { typedef void type; };`
	`73`	`+ typedef void result_type;`
`76`	`74`
`77`	`75`	`void operator()(std::string& utf8, uchar c) const`
`78`	`76`	`{`