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

clean up tuple includes

Browse source
This commit is contained in:
Dane Springmeyer 2014-07-22 23:01:31 -07:00
parent 64e70fb374
commit 58163a583c
10 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/feature_kv_iterator.hpp
View file

@ -29,7 +29,6 @@
// boost
#include <boost/variant/apply_visitor.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/iterator/iterator_traits.hpp>
#include <boost/iterator/iterator_facade.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
@ -37,7 +36,7 @@
// stl
#include <map>
#include <tuple>
namespace mapnik {

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

@ -31,7 +31,6 @@
#include <mapnik/vertex.hpp> // for CommandType::SEG_MOVETO
// boost
#include <boost/tuple/tuple.hpp>
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
@ -41,6 +40,9 @@
#include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunct
//stl
#include <tuple>
namespace boost { namespace spirit { namespace traits {
// make gcc and darwin toolsets happy.

2
include/mapnik/polygon_clipper.hpp
View file

@ -32,8 +32,6 @@
#include <mapnik/geometry.hpp>
// boost
#include <boost/tuple/tuple.hpp>
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/box.hpp>

4
include/mapnik/query.hpp
View file

@ -27,12 +27,10 @@
#include <mapnik/box2d.hpp>
#include <mapnik/attribute.hpp>
// boost
#include <boost/tuple/tuple.hpp>
// stl
#include <set>
#include <string>
#include <tuple>
namespace mapnik {

3
include/mapnik/segment.hpp
View file

@ -23,7 +23,8 @@
#ifndef MAPNIK_SEGMENT_HPP
#define MAPNIK_SEGMENT_HPP
#include <boost/tuple/tuple.hpp>
#include <tuple>
#include <algorithm>
namespace mapnik
{

1
include/mapnik/svg/output/svg_path_iterator.hpp
View file

@ -29,7 +29,6 @@
// boost
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/tuple/tuple.hpp>
#include <memory>
namespace mapnik {

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

@ -32,7 +32,6 @@
#include <mapnik/util/container_adapter.hpp>
// boost
#include <boost/tuple/tuple.hpp>
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>

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

@ -29,7 +29,6 @@
#include <mapnik/vertex.hpp> // for CommandType::SEG_MOVETO
// boost
#include <boost/tuple/tuple.hpp>
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
@ -40,6 +39,9 @@
#include <boost/type_traits/remove_pointer.hpp>
#include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunct
// stl
#include <tuple>
namespace boost { namespace spirit { namespace traits {
// make gcc and darwin toolsets happy.

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

@ -27,9 +27,11 @@
#include <mapnik/global.hpp>
// boost
#include <boost/tuple/tuple.hpp>
#include <boost/iterator/iterator_facade.hpp>
// stl
#include <tuple>
namespace mapnik { namespace util {
template <typename T>

5
include/mapnik/vertex_vector.hpp
View file

@ -31,9 +31,8 @@
#include <mapnik/vertex.hpp>
#include <mapnik/noncopyable.hpp>
// boost
#include <boost/tuple/tuple.hpp>
// stl
#include <tuple>
#include <cstring> // required for memcpy with linux/g++
namespace mapnik