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

no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header, it is now set in SConstruct

Browse source
This commit is contained in:
Dane Springmeyer 2013-09-18 18:27:04 -07:00
parent 12395eb1cd
commit d2f50a0158
24 changed files with 0 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/css_color_grammar.hpp
View file

@ -27,8 +27,6 @@
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/util/hsl.hpp> #include <mapnik/util/hsl.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// spirit2 // spirit2
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_action.hpp> #include <boost/spirit/include/qi_action.hpp>

2
include/mapnik/expression_grammar.hpp
View file

@ -23,8 +23,6 @@
#ifndef MAPNIK_EXPRESSIONS_GRAMMAR_HPP #ifndef MAPNIK_EXPRESSIONS_GRAMMAR_HPP
#define MAPNIK_EXPRESSIONS_GRAMMAR_HPP #define MAPNIK_EXPRESSIONS_GRAMMAR_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// mapnik // mapnik
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/value_types.hpp> #include <mapnik/value_types.hpp>

1
include/mapnik/image_filter_grammar.hpp
View file

@ -23,7 +23,6 @@
#ifndef MAPNIK_IMAGE_FILITER_GRAMMAR_HPP #ifndef MAPNIK_IMAGE_FILITER_GRAMMAR_HPP
#define MAPNIK_IMAGE_FILITER_GRAMMAR_HPP #define MAPNIK_IMAGE_FILITER_GRAMMAR_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// boost // boost
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>

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

@ -28,7 +28,6 @@
#include <mapnik/json/feature_grammar.hpp> #include <mapnik/json/feature_grammar.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// spirit::qi // spirit::qi
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix.hpp> #include <boost/spirit/include/phoenix.hpp>

2
include/mapnik/json/feature_generator_grammar.hpp
View file

@ -23,8 +23,6 @@
#ifndef MAPNIK_JSON_FEATURE_GENERATOR_GRAMMAR_HPP #ifndef MAPNIK_JSON_FEATURE_GENERATOR_GRAMMAR_HPP
#define MAPNIK_JSON_FEATURE_GENERATOR_GRAMMAR_HPP #define MAPNIK_JSON_FEATURE_GENERATOR_GRAMMAR_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/value_types.hpp> #include <mapnik/value_types.hpp>

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

@ -23,7 +23,6 @@
#ifndef MAPNIK_FEATURE_GRAMMAR_HPP #ifndef MAPNIK_FEATURE_GRAMMAR_HPP
#define MAPNIK_FEATURE_GRAMMAR_HPP #define MAPNIK_FEATURE_GRAMMAR_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// mapnik // mapnik
#include <mapnik/json/geometry_grammar.hpp> #include <mapnik/json/geometry_grammar.hpp>
#include <mapnik/value.hpp> #include <mapnik/value.hpp>

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

@ -23,7 +23,6 @@
#ifndef MAPNIK_JSON_GEOMETRY_GENERATOR_GRAMMAR_HPP #ifndef MAPNIK_JSON_GEOMETRY_GENERATOR_GRAMMAR_HPP
#define MAPNIK_JSON_GEOMETRY_GENERATOR_GRAMMAR_HPP #define MAPNIK_JSON_GEOMETRY_GENERATOR_GRAMMAR_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>

2
include/mapnik/json/geometry_grammar.hpp
View file

@ -27,8 +27,6 @@
#include <mapnik/geometry.hpp> // for geometry_type #include <mapnik/geometry.hpp> // for geometry_type
#include <mapnik/vertex.hpp> // for CommandType #include <mapnik/vertex.hpp> // for CommandType
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// spirit::qi // spirit::qi
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/spirit/include/phoenix_function.hpp>

1
include/mapnik/path_expression_grammar.hpp
View file

@ -26,7 +26,6 @@
// mapnik // mapnik
#include <mapnik/path_expression.hpp> #include <mapnik/path_expression.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// spirit2 // spirit2
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_action.hpp> #include <boost/spirit/include/qi_action.hpp>

1
include/mapnik/svg/svg_path_grammar.hpp
View file

@ -26,7 +26,6 @@
// mapnik // mapnik
#include <mapnik/svg/svg_path_commands.hpp> #include <mapnik/svg/svg_path_commands.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// spirit // spirit
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/spirit/include/phoenix_function.hpp>

1
include/mapnik/transform_expression_grammar.hpp
View file

@ -27,7 +27,6 @@
#include <mapnik/expression_grammar.hpp> #include <mapnik/expression_grammar.hpp>
#include <mapnik/transform_expression.hpp> #include <mapnik/transform_expression.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// spirit // spirit
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>

2
include/mapnik/util/dasharray_parser.hpp
View file

@ -23,8 +23,6 @@
#ifndef MAPNIK_UTIL_DASHARRAY_PARSER_HPP #ifndef MAPNIK_UTIL_DASHARRAY_PARSER_HPP
#define MAPNIK_UTIL_DASHARRAY_PARSER_HPP #define MAPNIK_UTIL_DASHARRAY_PARSER_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_core.hpp> #include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp> #include <boost/spirit/include/phoenix_operator.hpp>

2
include/mapnik/util/geometry_svg_generator.hpp
View file

@ -23,8 +23,6 @@
#ifndef MAPNIK_GEOMETRY_SVG_GENERATOR_HPP #ifndef MAPNIK_GEOMETRY_SVG_GENERATOR_HPP
#define MAPNIK_GEOMETRY_SVG_GENERATOR_HPP #define MAPNIK_GEOMETRY_SVG_GENERATOR_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/geometry.hpp> // for container stuff #include <mapnik/geometry.hpp> // for container stuff

2
include/mapnik/util/geometry_to_svg.hpp
View file

@ -28,8 +28,6 @@
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/util/geometry_svg_generator.hpp> #include <mapnik/util/geometry_svg_generator.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// boost // boost
#include <boost/spirit/include/karma.hpp> #include <boost/spirit/include/karma.hpp>

4
include/mapnik/util/geometry_wkt_generator.hpp
View file

@ -23,15 +23,11 @@
#ifndef MAPNIK_GEOMETRY_WKT_GENERATOR_HPP #ifndef MAPNIK_GEOMETRY_WKT_GENERATOR_HPP
#define MAPNIK_GEOMETRY_WKT_GENERATOR_HPP #define MAPNIK_GEOMETRY_WKT_GENERATOR_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/vertex.hpp> // for CommandType::SEG_MOVETO #include <mapnik/vertex.hpp> // for CommandType::SEG_MOVETO
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// boost // boost
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/spirit/include/karma.hpp> #include <boost/spirit/include/karma.hpp>

2
include/mapnik/wkt/wkt_grammar.hpp
View file

@ -23,8 +23,6 @@
#ifndef MAPNIK_WKT_GRAMMAR_HPP #ifndef MAPNIK_WKT_GRAMMAR_HPP
#define MAPNIK_WKT_GRAMMAR_HPP #define MAPNIK_WKT_GRAMMAR_HPP
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
// spirit::qi // spirit::qi

2
src/conversions.cpp
View file

@ -26,8 +26,6 @@
#include <cstring> #include <cstring>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#if _MSC_VER #if _MSC_VER

1
src/json/feature_grammar.cpp
View file

@ -27,7 +27,6 @@
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/json/feature_grammar.hpp> #include <mapnik/json/feature_grammar.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// boost // boost
#include <boost/spirit/include/support_multi_pass.hpp> #include <boost/spirit/include/support_multi_pass.hpp>

2
src/json/geojson_generator.cpp
View file

@ -20,8 +20,6 @@
* *
*****************************************************************************/ *****************************************************************************/
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// boost // boost
#include <boost/version.hpp> #include <boost/version.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>

2
src/json/geometry_grammar.cpp
View file

@ -26,8 +26,6 @@
// mapnik // mapnik
#include <mapnik/json/geometry_grammar.hpp> #include <mapnik/json/geometry_grammar.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// boost // boost
#include <boost/spirit/include/support_multi_pass.hpp> #include <boost/spirit/include/support_multi_pass.hpp>
#include <boost/spirit/include/phoenix_object.hpp> #include <boost/spirit/include/phoenix_object.hpp>

2
src/json/geometry_parser.cpp
View file

@ -21,8 +21,6 @@
*****************************************************************************/ *****************************************************************************/
// mapnik // mapnik
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#include <mapnik/json/geometry_parser.hpp> #include <mapnik/json/geometry_parser.hpp>
#include <mapnik/json/geometry_grammar.hpp> #include <mapnik/json/geometry_grammar.hpp>

2
src/text_placements/simple.cpp
View file

@ -26,8 +26,6 @@
#include <mapnik/ptree_helpers.hpp> #include <mapnik/ptree_helpers.hpp>
#include <mapnik/xml_node.hpp> #include <mapnik/xml_node.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// boost // boost
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_core.hpp> #include <boost/spirit/include/phoenix_core.hpp>

1
src/transform_expression_grammar.cpp
View file

@ -20,7 +20,6 @@
* *
*****************************************************************************/ *****************************************************************************/
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// mapnik // mapnik
#include <mapnik/transform_expression_grammar.hpp> #include <mapnik/transform_expression_grammar.hpp>

2
tests/cpp_tests/conversions_test.cpp
View file

@ -1,5 +1,3 @@
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#include <boost/version.hpp> #include <boost/version.hpp>
#include <mapnik/value_types.hpp> #include <mapnik/value_types.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>