diff --git a/include/mapnik/make_unique.hpp b/include/mapnik/make_unique.hpp deleted file mode 100644 index 08324f84d..000000000 --- a/include/mapnik/make_unique.hpp +++ /dev/null @@ -1,42 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2021 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#ifndef MAPNIK_MAKE_UNIQUE_HPP -#define MAPNIK_MAKE_UNIQUE_HPP - -// http://stackoverflow.com/questions/14131454/visual-studio-2012-cplusplus-and-c-11 -#if defined(_MSC_VER) && _MSC_VER < 1800 || !defined(_MSC_VER) && __cplusplus <= 201103L - -#include - -namespace std { - -// C++14 backfill from http://herbsutter.com/gotw/_102/ -template -inline std::unique_ptr make_unique(Args&& ...args) { - return std::unique_ptr(new T(std::forward(args)...)); -} - -} -#endif - -#endif // MAPNIK_MAKE_UNIQUE_HPP diff --git a/include/mapnik/quad_tree.hpp b/include/mapnik/quad_tree.hpp index e0cb2d58a..86a79b9ce 100644 --- a/include/mapnik/quad_tree.hpp +++ b/include/mapnik/quad_tree.hpp @@ -26,7 +26,6 @@ // mapnik #include #include -#include // stl #include diff --git a/include/mapnik/util/file_io.hpp b/include/mapnik/util/file_io.hpp index 8bb39f1fb..8c7a34c36 100644 --- a/include/mapnik/util/file_io.hpp +++ b/include/mapnik/util/file_io.hpp @@ -24,7 +24,6 @@ #define MAPNIK_FILE_IO_HPP // mapnik -#include #include #include diff --git a/include/mapnik/util/geometry_to_wkb.hpp b/include/mapnik/util/geometry_to_wkb.hpp index bd52f7bd9..cb3193807 100644 --- a/include/mapnik/util/geometry_to_wkb.hpp +++ b/include/mapnik/util/geometry_to_wkb.hpp @@ -25,7 +25,6 @@ // mapnik #include -#include #include #include #include diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp index 9ae7d755a..fad75452a 100644 --- a/plugins/input/csv/csv_datasource.cpp +++ b/plugins/input/csv/csv_datasource.cpp @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #if defined(MAPNIK_MEMORY_MAPPED_FILE) diff --git a/plugins/input/geobuf/geobuf_datasource.cpp b/plugins/input/geobuf/geobuf_datasource.cpp index 7866d099d..3dbdc93fc 100644 --- a/plugins/input/geobuf/geobuf_datasource.cpp +++ b/plugins/input/geobuf/geobuf_datasource.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #include using mapnik::datasource; diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp index ad83befd1..62952e9ce 100644 --- a/plugins/input/geojson/geojson_datasource.cpp +++ b/plugins/input/geojson/geojson_datasource.cpp @@ -48,7 +48,6 @@ MAPNIK_DISABLE_WARNING_POP #include #include #include -#include #include #include #include diff --git a/plugins/input/shape/shape_datasource.cpp b/plugins/input/shape/shape_datasource.cpp index 1065710eb..21a8d5867 100644 --- a/plugins/input/shape/shape_datasource.cpp +++ b/plugins/input/shape/shape_datasource.cpp @@ -33,7 +33,6 @@ MAPNIK_DISABLE_WARNING_POP // mapnik #include -#include #include #include #include diff --git a/plugins/input/shape/shape_io.cpp b/plugins/input/shape/shape_io.cpp index 92dfee667..4934089f8 100644 --- a/plugins/input/shape/shape_io.cpp +++ b/plugins/input/shape/shape_io.cpp @@ -24,7 +24,6 @@ // mapnik #include -#include #include #include #include diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp index c67c47d92..fd0d55cf6 100644 --- a/plugins/input/topojson/topojson_datasource.cpp +++ b/plugins/input/topojson/topojson_datasource.cpp @@ -38,7 +38,6 @@ #include #include #include -#include using mapnik::datasource; using mapnik::parameters; diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp index f9956616e..e03ddcaee 100644 --- a/src/agg/agg_renderer.cpp +++ b/src/agg/agg_renderer.cpp @@ -42,7 +42,6 @@ #include #include #include -#include #include MAPNIK_DISABLE_WARNING_PUSH diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp index 345bbea45..88147163d 100644 --- a/src/agg/process_building_symbolizer.cpp +++ b/src/agg/process_building_symbolizer.cpp @@ -21,7 +21,6 @@ *****************************************************************************/ // mapnik -#include #include #include #include diff --git a/src/cairo/process_building_symbolizer.cpp b/src/cairo/process_building_symbolizer.cpp index 65fdef503..b583fca99 100644 --- a/src/cairo/process_building_symbolizer.cpp +++ b/src/cairo/process_building_symbolizer.cpp @@ -23,7 +23,6 @@ #if defined(HAVE_CAIRO) // mapnik -#include #include #include #include diff --git a/src/cairo/process_line_pattern_symbolizer.cpp b/src/cairo/process_line_pattern_symbolizer.cpp index 07dc3c1ce..0c6971335 100644 --- a/src/cairo/process_line_pattern_symbolizer.cpp +++ b/src/cairo/process_line_pattern_symbolizer.cpp @@ -23,7 +23,6 @@ #if defined(HAVE_CAIRO) // mapnik -#include #include #include #include diff --git a/src/cairo/process_raster_symbolizer.cpp b/src/cairo/process_raster_symbolizer.cpp index f8d37b1e6..251238de6 100644 --- a/src/cairo/process_raster_symbolizer.cpp +++ b/src/cairo/process_raster_symbolizer.cpp @@ -23,7 +23,6 @@ #if defined(HAVE_CAIRO) // mapnik -#include #include #include #include diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp index 0f23f36fb..6caadd04d 100644 --- a/src/font_engine_freetype.cpp +++ b/src/font_engine_freetype.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include MAPNIK_DISABLE_WARNING_PUSH diff --git a/src/grid/process_building_symbolizer.cpp b/src/grid/process_building_symbolizer.cpp index 93e39eb7b..4bb05c335 100644 --- a/src/grid/process_building_symbolizer.cpp +++ b/src/grid/process_building_symbolizer.cpp @@ -23,7 +23,6 @@ #if defined(GRID_RENDERER) // mapnik -#include #include #include #include diff --git a/src/renderer_common/render_thunk_extractor.cpp b/src/renderer_common/render_thunk_extractor.cpp index 7b96ca777..6f0924901 100644 --- a/src/renderer_common/render_thunk_extractor.cpp +++ b/src/renderer_common/render_thunk_extractor.cpp @@ -22,7 +22,6 @@ // mapnik #include -#include #include #include diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp index e1672b1d1..2c8a42be3 100644 --- a/src/text/text_layout.cpp +++ b/src/text/text_layout.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include MAPNIK_DISABLE_WARNING_PUSH diff --git a/src/text/text_properties.cpp b/src/text/text_properties.cpp index df3d38f91..1c9a5e9d6 100644 --- a/src/text/text_properties.cpp +++ b/src/text/text_properties.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include MAPNIK_DISABLE_WARNING_PUSH diff --git a/src/vertex_cache.cpp b/src/vertex_cache.cpp index 12c50bb94..160ed4ad1 100644 --- a/src/vertex_cache.cpp +++ b/src/vertex_cache.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace mapnik { diff --git a/src/webp_reader.cpp b/src/webp_reader.cpp index 095d3b004..d09d996ba 100644 --- a/src/webp_reader.cpp +++ b/src/webp_reader.cpp @@ -21,7 +21,6 @@ *****************************************************************************/ // mapnik -#include #include #include diff --git a/src/wkb.cpp b/src/wkb.cpp index 9da6f7afa..6899d88a8 100644 --- a/src/wkb.cpp +++ b/src/wkb.cpp @@ -21,7 +21,6 @@ *****************************************************************************/ // mapnik -#include #include #include #include diff --git a/src/xml_tree.cpp b/src/xml_tree.cpp index dc723de97..823d3e649 100644 --- a/src/xml_tree.cpp +++ b/src/xml_tree.cpp @@ -22,7 +22,6 @@ //mapnik #include -#include #include #include #include