Merge branch 'master' into bbox-index

SConstruct

@@ -807,7 +807,7 @@ int main()
     return ret
 
 def CheckIcuData(context, silent=False):
-
+ 
     if not silent:
         context.Message('Checking for ICU data directory...')
     ret = context.TryRun("""
@@ -834,7 +834,7 @@ int main() {
     return ret[1].strip()
 
 def CheckGdalData(context, silent=False):
-
+ 
     if not silent:
         context.Message('Checking for GDAL data directory...')
     ret = context.TryRun("""
@@ -857,7 +857,7 @@ int main() {
     return ret[1].strip()
 
 def CheckProjData(context, silent=False):
-
+ 
     if not silent:
         context.Message('Checking for PROJ_LIB directory...')
     ret = context.TryRun("""
@@ -1891,6 +1891,10 @@ if not preconfigured:
         debug_defines = ['-DDEBUG', '-DMAPNIK_DEBUG']
         ndebug_defines = ['-DNDEBUG']
 
+        # faster compile
+        # http://www.boost.org/doc/libs/1_47_0/libs/spirit/doc/html/spirit/what_s_new/spirit_2_5.html#spirit.what_s_new.spirit_2_5.breaking_changes
+        env.Append(CPPDEFINES = '-DBOOST_SPIRIT_NO_PREDEFINED_TERMINALS=1')
+        env.Append(CPPDEFINES = '-DBOOST_PHOENIX_NO_PREDEFINED_TERMINALS=1')
         # c++11 support / https://github.com/mapnik/mapnik/issues/1683
         #  - upgrade to PHOENIX_V3 since that is needed for c++11 compile
         env.Append(CPPDEFINES = '-DBOOST_SPIRIT_USE_PHOENIX_V3=1')

include/mapnik/feature_style_processor_impl.hpp

@@ -213,8 +213,12 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay,
 
     if (!mat.active_styles_.empty())
     {
+        p.start_layer_processing(mat.lay_, mat.layer_ext2_);
+
         render_material(mat,p);
         render_submaterials(mat, p);
+
+        p.end_layer_processing(mat.lay_);
     }
 }
 

src/expression.cpp

@@ -50,7 +50,7 @@ expression_ptr parse_expression(std::string const& str)
     }
     catch (boost::spirit::x3::expectation_failure<std::string::const_iterator> const& ex)
     {
-        // no need to show "boost::spirit::qi::expectation_failure" which is a std::runtime_error
+        // no need to show "boost::spirit::x3::expectation_failure" which is a std::runtime_error
         throw config_error("Failed to parse expression: \"" + str + "\"");
     }
     catch (std::exception const& ex)