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

Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-03 09:32:25 -08:00
commit 9baec5c22f
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -49,6 +49,11 @@ src/json/libmapnik-json.a:
src/renderer_common/render_thunk_extractor.os \ src/renderer_common/render_thunk_extractor.os \
src/json/libmapnik-json.a \ src/json/libmapnik-json.a \
src/wkt/libmapnik-wkt.a \ src/wkt/libmapnik-wkt.a \
src/marker_helpers.os \
src/svg/svg_transform_parser.os \
src/agg/process_line_symbolizer.os \
plugins/input/geojson/geojson_datasource.os \
utils/mapnik-index/process_geojson_file.o \
mapnik: src/json/libmapnik-json.a mapnik: src/json/libmapnik-json.a
# then install the rest with -j$(JOBS) # then install the rest with -j$(JOBS)

1
include/mapnik/json/topojson_grammar_impl.hpp
View file

@ -24,6 +24,7 @@
#include <mapnik/json/generic_json.hpp> #include <mapnik/json/generic_json.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/spirit/include/phoenix_function.hpp>