From 582ca02f447ff82828fa2ce708fb1540b9c68e84 Mon Sep 17 00:00:00 2001 From: artemp Date: Fri, 11 Oct 2013 13:39:39 +0100 Subject: [PATCH] remove unused boost.thread includes --- benchmark/allocation.cpp | 3 +-- include/mapnik/debug.hpp | 2 +- include/mapnik/font_engine_freetype.hpp | 2 +- include/mapnik/pool.hpp | 2 +- plugins/input/occi/occi_types.hpp | 5 ----- src/projection.cpp | 2 +- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/benchmark/allocation.cpp b/benchmark/allocation.cpp index 75ca4e733..2311cb111 100644 --- a/benchmark/allocation.cpp +++ b/benchmark/allocation.cpp @@ -5,7 +5,6 @@ #define BOOST_CHRONO_HEADER_ONLY #include #include -#include using namespace boost::chrono; using namespace mapnik; @@ -46,4 +45,4 @@ void test_wkt_creation() int main( int, char*[] ) { return 0; -} \ No newline at end of file +} diff --git a/include/mapnik/debug.hpp b/include/mapnik/debug.hpp index 33c7a516e..8122cace7 100644 --- a/include/mapnik/debug.hpp +++ b/include/mapnik/debug.hpp @@ -31,7 +31,7 @@ // boost #include #ifdef MAPNIK_THREADSAFE -#include +#include #endif // std diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp index cdcc5ce77..e942352c1 100644 --- a/include/mapnik/font_engine_freetype.hpp +++ b/include/mapnik/font_engine_freetype.hpp @@ -44,7 +44,7 @@ #include #ifdef MAPNIK_THREADSAFE -#include +#include #endif // stl diff --git a/include/mapnik/pool.hpp b/include/mapnik/pool.hpp index e6eca33af..e08c9db27 100644 --- a/include/mapnik/pool.hpp +++ b/include/mapnik/pool.hpp @@ -31,7 +31,7 @@ // boost #include #ifdef MAPNIK_THREADSAFE -#include +#include #endif // stl diff --git a/plugins/input/occi/occi_types.hpp b/plugins/input/occi/occi_types.hpp index 896219a62..066704c14 100644 --- a/plugins/input/occi/occi_types.hpp +++ b/plugins/input/occi/occi_types.hpp @@ -27,11 +27,6 @@ #include #include -// boost -#ifdef MAPNIK_THREADSAFE -#include -#endif - // occi #include diff --git a/src/projection.cpp b/src/projection.cpp index 7bfe052fb..99fc92cd6 100644 --- a/src/projection.cpp +++ b/src/projection.cpp @@ -33,7 +33,7 @@ // proj4 #include #if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480 -#include +#include #ifdef _MSC_VER #pragma NOTE(mapnik is building against < proj 4.8, reprojection will be faster if you use >= 4.8) #else