From 483f7095418b14c8d663c4848d8686e733473a91 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 25 Nov 2016 16:52:56 +0100
Subject: [PATCH] don't include xxx_def.hpp + make rules const

---
 include/mapnik/json/generic_json_grammar_x3_def.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/json/generic_json_grammar_x3_def.hpp b/include/mapnik/json/generic_json_grammar_x3_def.hpp
index 390c2251e..64570eeb1 100644
--- a/include/mapnik/json/generic_json_grammar_x3_def.hpp
+++ b/include/mapnik/json/generic_json_grammar_x3_def.hpp
@@ -25,7 +25,7 @@
 
 #include <boost/fusion/include/std_pair.hpp>
 #include <mapnik/json/generic_json_grammar_x3.hpp>
-#include <mapnik/json/unicode_string_grammar_x3_def.hpp>
+#include <mapnik/json/unicode_string_grammar_x3.hpp>
 
 namespace mapnik { namespace json { namespace grammar {
 
@@ -69,9 +69,9 @@ using x3::string;
 generic_json_grammar_type const value("JSON Value");
 generic_json_key_value_type const key_value("JSON Object element");
 // rules
-x3::rule<class json_object_tag, json_object> object("JSON Object");
-x3::rule<class json_array_tag, json_array> array("JSON Array");
-x3::rule<class json_number_tag, json_value> number("JSON Number");
+x3::rule<class json_object_tag, json_object> const object("JSON Object");
+x3::rule<class json_array_tag, json_array> const array("JSON Array");
+x3::rule<class json_number_tag, json_value> const number("JSON Number");
 
 auto const json_double = x3::real_parser<value_double, x3::strict_real_policies<value_double>>();
 auto const json_integer = x3::int_parser<value_integer, 10, 1, -1>();