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

clean up spirit headers to avoid usage of non-standard/non-futureproof spirit/home path - refs #1658

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-15 14:32:29 -08:00
parent 5c601a71b1
commit 2d340a296f
14 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/css_color_grammar.hpp
View file

@ -27,7 +27,6 @@
#include <mapnik/color.hpp>
// spirit2
#include <boost/config/warning_disable.hpp>
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_action.hpp>

12
include/mapnik/expression_grammar.hpp
View file

@ -29,17 +29,11 @@
#include <mapnik/expression_node.hpp>
// spirit2
#include <boost/spirit/home/qi/domain.hpp> // for qi
#include <boost/spirit/home/qi/nonterminal/grammar.hpp> // for grammar
#include <boost/spirit/home/qi/nonterminal/rule.hpp> // for rule
#include <boost/spirit/home/qi/numeric/int.hpp> // for int_parser
#include <boost/spirit/home/qi/numeric/real.hpp> // for real_parser
#include <boost/spirit/home/qi/string/symbols.hpp>
#include <boost/spirit/home/support/common_terminals.hpp>
#include <boost/spirit/home/support/nonterminal/locals.hpp> // for locals
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/support_locals.hpp>
// phoenix
#include <boost/spirit/home/phoenix/function/function.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
namespace mapnik
{

1
include/mapnik/image_filter_types.hpp
View file

@ -25,7 +25,6 @@
// boost
#include <boost/variant/variant_fwd.hpp>
#include <boost/config/warning_disable.hpp>
// stl
#include <iostream>

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

@ -28,6 +28,7 @@
#include <mapnik/geometry.hpp>
#include <mapnik/util/path_iterator.hpp>
#include <mapnik/util/container_adapter.hpp>
#include <mapnik/vertex.hpp> // for CommandType::SEG_MOVETO
// boost
#include <boost/tuple/tuple.hpp>
@ -36,7 +37,7 @@
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/home/phoenix/statement/if.hpp>
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/fusion/include/boost_tuple.hpp>
#include <boost/math/special_functions/trunc.hpp> // trunc to avoid needing C++11
@ -158,7 +159,6 @@ struct geometry_generator_grammar :
using boost::spirit::karma::_a;
using boost::spirit::karma::_r1;
using boost::spirit::karma::eps;
using boost::spirit::karma::string;
coordinates = point | linestring | polygon
;
@ -186,7 +186,7 @@ struct geometry_generator_grammar :
;
polygon_coord %= ( &uint_(mapnik::SEG_MOVETO) << eps[_r1 += 1]
<< string[ if_ (_r1 > 1) [_1 = "],["]
<< karma::string[ if_ (_r1 > 1) [_1 = "],["]
.else_[_1 = '[' ]] | &uint_ << lit(','))
<< lit('[') << coord_type
<< lit(',')
@ -235,7 +235,6 @@ struct multi_geometry_generator_grammar :
using boost::spirit::karma::_1;
using boost::spirit::karma::_a;
using boost::spirit::karma::_r1;
using boost::spirit::karma::string;
geometry_types.add
(mapnik::Point,"\"Point\"")
@ -259,9 +258,9 @@ struct multi_geometry_generator_grammar :
geometry = (lit("{\"type\":")
<< geometry_types[_1 = phoenix::at_c<0>(_a)][_a = _multi_type(_val)]
<< lit(",\"coordinates\":")
<< string[ if_ (phoenix::at_c<0>(_a) > 3) [_1 = '[']]
<< karma::string[ if_ (phoenix::at_c<0>(_a) > 3) [_1 = '[']]
<< coordinates
<< string[ if_ (phoenix::at_c<0>(_a) > 3) [_1 = ']']]
<< karma::string[ if_ (phoenix::at_c<0>(_a) > 3) [_1 = ']']]
<< lit('}')) | lit("null")
;

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

@ -35,7 +35,6 @@
namespace mapnik { namespace svg {
using namespace boost::spirit;
using namespace boost::fusion;
using namespace boost::phoenix;
template <typename Iterator, typename SkipType, typename PathType>
@ -135,7 +134,7 @@ namespace mapnik { namespace svg {
qi::rule<Iterator,qi::locals<bool>,SkipType> A; // A,a
qi::rule<Iterator,SkipType> Z; // Z,z
qi::rule<Iterator,vector2<double,double>(),SkipType> coord;
qi::rule<Iterator,boost::fusion::vector2<double,double>(),SkipType> coord;
// commands
function<move_to<PathType> > move_to_;

3
include/mapnik/svg/svg_points_grammar.hpp
View file

@ -34,7 +34,6 @@
namespace mapnik { namespace svg {
using namespace boost::spirit;
using namespace boost::fusion;
using namespace boost::phoenix;
template <typename Iterator, typename SkipType, typename PathType>
@ -58,7 +57,7 @@ namespace mapnik { namespace svg {
// rules
qi::rule<Iterator,SkipType> start;
qi::rule<Iterator,vector2<double,double>(),SkipType> coord;
qi::rule<Iterator,boost::fusion::vector2<double,double>(),SkipType> coord;
// commands
function<move_to<PathType> > move_to_;

2
include/mapnik/svg/svg_transform_grammar.hpp
View file

@ -34,7 +34,7 @@
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/home/phoenix/object/construct.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
namespace mapnik { namespace svg {

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

@ -28,7 +28,7 @@
#include <mapnik/util/path_iterator.hpp>
// boost
#include <boost/spirit/home/support/container.hpp>
#include <boost/spirit/include/support_container.hpp>
namespace boost { namespace spirit { namespace traits {

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

@ -37,7 +37,7 @@
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/home/phoenix/statement/if.hpp>
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/fusion/include/boost_tuple.hpp>
#include <boost/type_traits/remove_pointer.hpp>

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

@ -25,6 +25,8 @@
// mapnik
#include <mapnik/global.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/vertex.hpp> // for CommandType::SEG_MOVETO
// boost
#include <boost/tuple/tuple.hpp>
@ -33,7 +35,7 @@
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/home/phoenix/statement/if.hpp>
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/fusion/include/boost_tuple.hpp>
#include <boost/type_traits/remove_pointer.hpp>

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

@ -32,7 +32,7 @@
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/home/phoenix/object/new.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
#include <boost/spirit/include/phoenix_stl.hpp>
// mapnik
#include <mapnik/geometry.hpp>

2
src/expression_grammar.cpp
View file

@ -30,7 +30,7 @@
#include <boost/version.hpp>
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/home/phoenix/object/construct.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
// fwd declare
namespace mapnik {

1
src/path_expression_grammar.cpp
View file

@ -25,7 +25,6 @@
#include <mapnik/attribute.hpp>
// boost
#include <boost/spirit/home/phoenix/object/construct.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
#include <boost/spirit/include/phoenix_stl.hpp>

2
src/transform_expression_grammar.cpp
View file

@ -27,7 +27,7 @@
#include <boost/version.hpp>
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/home/phoenix/object/construct.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
namespace mapnik {