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

fix topojson compile and centralize confix workaround

Browse source
This commit is contained in:
Dane Springmeyer 2014-01-26 16:19:27 -08:00
parent d82d9d382f
commit c5aad93428
17 changed files with 12 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,18 +36,16 @@ topojson_grammar<Iterator>::topojson_grammar()
{
qi::lit_type lit;
qi::double_type double_;
qi::int__type int_;
qi::int_type int_;
qi::no_skip_type no_skip;
qi::omit_type omit;
qi::_val_type _val;
qi::_1_type _1;
qi::_2_type _2;
qi::_3_type _3;
qi::_4_type _4;
qi::fail_type fail;
qi::on_error_type on_error;
using standard_wide::char_;
standard_wide::char_type char_;
using qi::fail;
using qi::on_error;
using phoenix::construct;
// generic json types

8
include/mapnik/svg/output/svg_generator.hpp
View file

@ -23,6 +23,14 @@
#ifndef MAPNIK_SVG_GENERATOR_HPP
#define MAPNIK_SVG_GENERATOR_HPP
// FIXME: workaround incompatibility of karma with -DBOOST_SPIRIT_NO_PREDEFINED_TERMINALS=1
/*
boost/spirit/repository/home/karma/directive/confix.hpp:49:23: error: no member named
'confix' in namespace 'boost::spirit::repository'
using repository::confix;
*/
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
// mapnik
#include <mapnik/ctrans.hpp>
#include <mapnik/color.hpp>

9
src/feature_style_processor.cpp
View file

@ -21,15 +21,6 @@
*****************************************************************************/
// mapnik
#if defined(SVG_RENDERER)
// FIXME: workaround incompatibility of karma with -DBOOST_SPIRIT_NO_PREDEFINED_TERMINALS=1
/*
boost/spirit/repository/home/karma/directive/confix.hpp:49:23: error: no member named
'confix' in namespace 'boost::spirit::repository'
using repository::confix;
*/
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#endif
#include <mapnik/feature_style_processor_impl.hpp>
#include <mapnik/agg_renderer.hpp>

1
src/svg/output/process_building_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_line_pattern_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_line_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_markers_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_point_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_polygon_pattern_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_polygon_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_raster_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_shield_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/process_symbolizers.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik {

1
src/svg/output/process_text_symbolizer.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_renderer.hpp>
namespace mapnik

1
src/svg/output/svg_generator.cpp
View file

@ -21,7 +21,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_generator.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/util/conversions.hpp>

1
src/svg/output/svg_output_attributes.cpp
View file

@ -22,7 +22,6 @@
*****************************************************************************/
// mapnik
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
#include <mapnik/svg/output/svg_output_attributes.hpp>
namespace mapnik { namespace svg {

8
src/svg/output/svg_renderer.cpp
View file

@ -20,14 +20,6 @@
*
*****************************************************************************/
// FIXME: workaround incompatibility of karma with -DBOOST_SPIRIT_NO_PREDEFINED_TERMINALS=1
/*
boost/spirit/repository/home/karma/directive/confix.hpp:49:23: error: no member named
'confix' in namespace 'boost::spirit::repository'
using repository::confix;
*/
#undef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
// mapnik
#include <mapnik/debug.hpp>
#include <mapnik/svg/output/svg_renderer.hpp>