From 3b2bdba7b0fb7b3c3881a424a16f4621f7c777da Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 2 Jun 2013 20:19:33 -0700 Subject: [PATCH] iwyu --- benchmark/run.cpp | 2 ++ bindings/python/mapnik_feature.cpp | 4 +++- bindings/python/mapnik_geometry.cpp | 3 +++ bindings/python/mapnik_palette.cpp | 3 +++ bindings/python/mapnik_proj_transform.cpp | 4 ++++ bindings/python/mapnik_python.cpp | 3 +++ bindings/python/python_grid_utils.cpp | 3 +++ include/mapnik/feature_style_processor_impl.hpp | 2 +- include/mapnik/params_impl.hpp | 3 +++ include/mapnik/simplify_converter.hpp | 7 +++++-- include/mapnik/xml_attribute_cast.hpp | 3 +++ plugins/input/shape/dbfile.cpp | 1 + plugins/input/shape/shapefile.hpp | 2 ++ src/datasource_cache.cpp | 1 + src/debug.cpp | 1 + src/font_engine_freetype.cpp | 1 + src/fs.cpp | 3 +++ src/json/feature_collection_parser.cpp | 3 +++ src/json/geojson_generator.cpp | 2 +- src/json/geometry_parser.cpp | 3 +++ src/map.cpp | 3 +++ src/parse_path.cpp | 4 ++++ src/proj_transform.cpp | 1 + src/projection.cpp | 3 +++ src/wkt/wkt_factory.cpp | 2 ++ tests/cpp_tests/clipping_test.cpp | 2 +- tests/cpp_tests/geometry_converters_test.cpp | 3 +++ 27 files changed, 66 insertions(+), 6 deletions(-) diff --git a/benchmark/run.cpp b/benchmark/run.cpp index c20c153d3..251bf7161 100644 --- a/benchmark/run.cpp +++ b/benchmark/run.cpp @@ -12,6 +12,8 @@ #include #include #include +#include + // boost #include diff --git a/bindings/python/mapnik_feature.cpp b/bindings/python/mapnik_feature.cpp index 8f4e4494f..f597c9b56 100644 --- a/bindings/python/mapnik_feature.cpp +++ b/bindings/python/mapnik_feature.cpp @@ -30,7 +30,6 @@ #include #include - // mapnik #include #include @@ -39,6 +38,9 @@ #include #include +// stl +#include + namespace { using mapnik::geometry_utils; diff --git a/bindings/python/mapnik_geometry.cpp b/bindings/python/mapnik_geometry.cpp index 1a949c6aa..8eeafc49f 100644 --- a/bindings/python/mapnik_geometry.cpp +++ b/bindings/python/mapnik_geometry.cpp @@ -43,6 +43,9 @@ #include #endif +// stl +#include + namespace { using mapnik::from_wkt; diff --git a/bindings/python/mapnik_palette.cpp b/bindings/python/mapnik_palette.cpp index 2d82c0919..d28f081c8 100644 --- a/bindings/python/mapnik_palette.cpp +++ b/bindings/python/mapnik_palette.cpp @@ -28,6 +28,9 @@ //mapnik #include +// stl +#include + static boost::shared_ptr make_palette( std::string const& palette, std::string const& format ) { mapnik::rgba_palette::palette_type type = mapnik::rgba_palette::PALETTE_RGBA; diff --git a/bindings/python/mapnik_proj_transform.cpp b/bindings/python/mapnik_proj_transform.cpp index 5b1115555..95b4408e8 100644 --- a/bindings/python/mapnik_proj_transform.cpp +++ b/bindings/python/mapnik_proj_transform.cpp @@ -27,6 +27,10 @@ // boost #include +// stl +#include + + using mapnik::proj_transform; using mapnik::projection; diff --git a/bindings/python/mapnik_python.cpp b/bindings/python/mapnik_python.cpp index 6a07a3936..81ee0661e 100644 --- a/bindings/python/mapnik_python.cpp +++ b/bindings/python/mapnik_python.cpp @@ -25,6 +25,9 @@ #include #include +// stl +#include + void register_cairo(); void export_color(); void export_coord(); diff --git a/bindings/python/python_grid_utils.cpp b/bindings/python/python_grid_utils.cpp index 952f5ce36..e5bd5103e 100644 --- a/bindings/python/python_grid_utils.cpp +++ b/bindings/python/python_grid_utils.cpp @@ -39,6 +39,9 @@ #include "mapnik_value_converter.hpp" #include "python_grid_utils.hpp" +// stl +#include + namespace mapnik { diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp index 2e8222551..b03b8732b 100644 --- a/include/mapnik/feature_style_processor_impl.hpp +++ b/include/mapnik/feature_style_processor_impl.hpp @@ -54,7 +54,7 @@ // stl #include - +#include #if defined(RENDERING_STATS) #include diff --git a/include/mapnik/params_impl.hpp b/include/mapnik/params_impl.hpp index 64f990bef..258275ff5 100644 --- a/include/mapnik/params_impl.hpp +++ b/include/mapnik/params_impl.hpp @@ -35,8 +35,11 @@ #include #include #include + // stl #include +#include + namespace mapnik { namespace detail { diff --git a/include/mapnik/simplify_converter.hpp b/include/mapnik/simplify_converter.hpp index 8aab345cc..2346a71a9 100644 --- a/include/mapnik/simplify_converter.hpp +++ b/include/mapnik/simplify_converter.hpp @@ -1,19 +1,22 @@ #ifndef MAPNIK_SIMPLIFY_CONVERTER_HPP #define MAPNIK_SIMPLIFY_CONVERTER_HPP +// mapnik #include #include #include #include #include -// STL +// stl #include #include #include #include #include -// Boost +#include + +// boost #include namespace mapnik diff --git a/include/mapnik/xml_attribute_cast.hpp b/include/mapnik/xml_attribute_cast.hpp index ac736f6ca..20a411c47 100644 --- a/include/mapnik/xml_attribute_cast.hpp +++ b/include/mapnik/xml_attribute_cast.hpp @@ -30,11 +30,14 @@ #include #include #include + // boost #include #include + // stl #include +#include namespace mapnik { namespace detail { diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp index d9d7bafb7..2c34c76ff 100644 --- a/plugins/input/shape/dbfile.cpp +++ b/plugins/input/shape/dbfile.cpp @@ -35,6 +35,7 @@ // stl #include +#include using mapnik::mapped_memory_cache; diff --git a/plugins/input/shape/shapefile.hpp b/plugins/input/shape/shapefile.hpp index 9daa50906..a07630410 100644 --- a/plugins/input/shape/shapefile.hpp +++ b/plugins/input/shape/shapefile.hpp @@ -26,6 +26,8 @@ // stl #include #include +#include + // mapnik #include diff --git a/src/datasource_cache.cpp b/src/datasource_cache.cpp index 3412451d6..9773bb2be 100644 --- a/src/datasource_cache.cpp +++ b/src/datasource_cache.cpp @@ -36,6 +36,7 @@ // stl #include #include +#include namespace mapnik { diff --git a/src/debug.cpp b/src/debug.cpp index bebacb4b3..f9a04fbc5 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -25,6 +25,7 @@ // stl #include +#include #ifndef MAPNIK_LOG_FORMAT #define MAPNIK_LOG_FORMAT Mapnik LOG> %Y-%m-%d %H:%M:%S: diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp index 354efa309..5f14544e3 100644 --- a/src/font_engine_freetype.cpp +++ b/src/font_engine_freetype.cpp @@ -39,6 +39,7 @@ // stl #include #include +#include // icu #include diff --git a/src/fs.cpp b/src/fs.cpp index 8951b223c..9eb01214b 100644 --- a/src/fs.cpp +++ b/src/fs.cpp @@ -29,6 +29,9 @@ // boost #include +// stl +#include + #if (BOOST_FILESYSTEM_VERSION <= 2) #include diff --git a/src/json/feature_collection_parser.cpp b/src/json/feature_collection_parser.cpp index 97b753480..0e1ce124e 100644 --- a/src/json/feature_collection_parser.cpp +++ b/src/json/feature_collection_parser.cpp @@ -35,6 +35,9 @@ #include #include +// stl +#include + namespace mapnik { namespace json { #if BOOST_VERSION >= 104700 diff --git a/src/json/geojson_generator.cpp b/src/json/geojson_generator.cpp index d178fe8d3..f35ba7265 100644 --- a/src/json/geojson_generator.cpp +++ b/src/json/geojson_generator.cpp @@ -62,7 +62,7 @@ bool geometry_generator::generate(std::string & geojson, mapnik::geometry_contai #include #include -#include +#include namespace mapnik { namespace json { diff --git a/src/json/geometry_parser.cpp b/src/json/geometry_parser.cpp index 53c48ff73..f88177765 100644 --- a/src/json/geometry_parser.cpp +++ b/src/json/geometry_parser.cpp @@ -30,6 +30,9 @@ #include #include +// stl +#include + namespace mapnik { namespace json { #if BOOST_VERSION >= 104700 diff --git a/src/map.cpp b/src/map.cpp index 0e840b030..618300159 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -42,6 +42,9 @@ // boost #include +// stl +#include + namespace mapnik { diff --git a/src/parse_path.cpp b/src/parse_path.cpp index b502128e4..90265b9ab 100644 --- a/src/parse_path.cpp +++ b/src/parse_path.cpp @@ -33,6 +33,10 @@ #include #include +// stl +#include + + namespace mapnik { path_expression_ptr parse_path(std::string const& str) diff --git a/src/proj_transform.cpp b/src/proj_transform.cpp index 9972ca4ae..688296496 100644 --- a/src/proj_transform.cpp +++ b/src/proj_transform.cpp @@ -33,6 +33,7 @@ // stl #include +#include namespace mapnik { diff --git a/src/projection.cpp b/src/projection.cpp index 57dcdb243..871e357a0 100644 --- a/src/projection.cpp +++ b/src/projection.cpp @@ -26,6 +26,9 @@ #include #include +// stl +#include + #ifdef MAPNIK_USE_PROJ4 // proj4 #include diff --git a/src/wkt/wkt_factory.cpp b/src/wkt/wkt_factory.cpp index 298b871fa..823965cf4 100644 --- a/src/wkt/wkt_factory.cpp +++ b/src/wkt/wkt_factory.cpp @@ -30,6 +30,8 @@ // stl #include #include +#include + namespace mapnik { diff --git a/tests/cpp_tests/clipping_test.cpp b/tests/cpp_tests/clipping_test.cpp index 0bb257492..6e6c6ca6e 100644 --- a/tests/cpp_tests/clipping_test.cpp +++ b/tests/cpp_tests/clipping_test.cpp @@ -9,7 +9,7 @@ #include // stl -#include +#include #include #include #include diff --git a/tests/cpp_tests/geometry_converters_test.cpp b/tests/cpp_tests/geometry_converters_test.cpp index 0a18b5096..2444371cd 100644 --- a/tests/cpp_tests/geometry_converters_test.cpp +++ b/tests/cpp_tests/geometry_converters_test.cpp @@ -18,6 +18,9 @@ #include #include +// stl +#include + struct output_geometry_backend { output_geometry_backend(boost::ptr_vector & paths, mapnik::eGeomType type)