Merge pull request #4275 from mathisloge/remove_make_unique_cpp11

include/mapnik/make_unique.hpp

@@ -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 <memory>
-
-namespace std {
-
-// C++14 backfill from http://herbsutter.com/gotw/_102/
-template<typename T, typename ...Args>
-inline std::unique_ptr<T> make_unique(Args&& ...args) {
-    return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-
-}
-#endif
-
-#endif // MAPNIK_MAKE_UNIQUE_HPP

include/mapnik/quad_tree.hpp

@@ -26,7 +26,6 @@
 // mapnik
 #include <mapnik/geometry/box2d.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/make_unique.hpp>
 
 // stl
 #include <memory>

include/mapnik/util/file_io.hpp

@@ -24,7 +24,6 @@
 #define MAPNIK_FILE_IO_HPP
 
 // mapnik
-#include <mapnik/make_unique.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 

include/mapnik/util/geometry_to_wkb.hpp

@@ -25,7 +25,6 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/make_unique.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry/geometry_type.hpp>

plugins/input/csv/csv_datasource.cpp

@@ -42,7 +42,6 @@
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/value/types.hpp>
 #include <mapnik/util/fs.hpp>
-#include <mapnik/make_unique.hpp>
 #include <mapnik/util/spatial_index.hpp>
 #include <mapnik/geom_util.hpp>
 #if defined(MAPNIK_MEMORY_MAPPED_FILE)

plugins/input/geobuf/geobuf_datasource.cpp

@@ -43,7 +43,6 @@
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/util/file_io.hpp>
-#include <mapnik/make_unique.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 
 using mapnik::datasource;

plugins/input/geojson/geojson_datasource.cpp

@@ -48,7 +48,6 @@ MAPNIK_DISABLE_WARNING_POP
 #include <mapnik/util/variant.hpp>
 #include <mapnik/util/file_io.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
-#include <mapnik/make_unique.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/util/spatial_index.hpp>

plugins/input/shape/shape_datasource.cpp

@@ -33,7 +33,6 @@ MAPNIK_DISABLE_WARNING_POP
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/make_unique.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/util/utf_conv_win.hpp>

plugins/input/shape/shape_io.cpp

@@ -24,7 +24,6 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/make_unique.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/util/is_clockwise.hpp>
 #include <mapnik/geometry/correct.hpp>

plugins/input/topojson/topojson_datasource.cpp

@@ -38,7 +38,6 @@
 #include <mapnik/json/topojson_utils.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/util/file_io.hpp>
-#include <mapnik/make_unique.hpp>
 
 using mapnik::datasource;
 using mapnik::parameters;

src/agg/agg_renderer.cpp

@@ -42,7 +42,6 @@
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/image_filter.hpp>
 #include <mapnik/image_any.hpp>
-#include <mapnik/make_unique.hpp>
 
 #include <mapnik/warning.hpp>
 MAPNIK_DISABLE_WARNING_PUSH

src/agg/process_building_symbolizer.cpp

@@ -21,7 +21,6 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/make_unique.hpp>
 #include <mapnik/image_any.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/agg_renderer.hpp>

src/cairo/process_building_symbolizer.cpp

@@ -23,7 +23,6 @@
 #if defined(HAVE_CAIRO)
 
 // mapnik
-#include <mapnik/make_unique.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/proj_transform.hpp>

src/cairo/process_line_pattern_symbolizer.cpp

@@ -23,7 +23,6 @@
 #if defined(HAVE_CAIRO)
 
 // mapnik
-#include <mapnik/make_unique.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/proj_transform.hpp>
 #include <mapnik/cairo/cairo_renderer.hpp>

src/cairo/process_raster_symbolizer.cpp

@@ -23,7 +23,6 @@
 #if defined(HAVE_CAIRO)
 
 // mapnik
-#include <mapnik/make_unique.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/proj_transform.hpp>

src/font_engine_freetype.cpp

@@ -27,7 +27,6 @@
 #include <mapnik/text/face.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/util/file_io.hpp>
-#include <mapnik/make_unique.hpp>
 
 #include <mapnik/warning.hpp>
 MAPNIK_DISABLE_WARNING_PUSH

src/grid/process_building_symbolizer.cpp

@@ -23,7 +23,6 @@
 #if defined(GRID_RENDERER)
 
 // mapnik
-#include <mapnik/make_unique.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/grid/grid_rasterizer.hpp>
 #include <mapnik/grid/grid_renderer.hpp>

src/renderer_common/render_thunk_extractor.cpp

@@ -22,7 +22,6 @@
 
 // mapnik
 #include <mapnik/label_collision_detector.hpp>
-#include <mapnik/make_unique.hpp>
 #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
 #include <mapnik/renderer_common/render_thunk_extractor.hpp>
 

src/text/text_layout.cpp

@@ -28,7 +28,6 @@
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/text/harfbuzz_shaper.hpp>
 #include <mapnik/util/math.hpp>
-#include <mapnik/make_unique.hpp>
 
 #include <mapnik/warning.hpp>
 MAPNIK_DISABLE_WARNING_PUSH

src/text/text_properties.cpp

@@ -33,7 +33,6 @@
 #include <mapnik/config_error.hpp>
 #include <mapnik/text/properties_util.hpp>
 #include <mapnik/boolean.hpp>
-#include <mapnik/make_unique.hpp>
 
 #include <mapnik/warning.hpp>
 MAPNIK_DISABLE_WARNING_PUSH

src/vertex_cache.cpp

@@ -23,7 +23,7 @@
 #include <mapnik/util/math.hpp>
 #include <mapnik/vertex_cache.hpp>
 #include <mapnik/offset_converter.hpp>
-#include <mapnik/make_unique.hpp>
+#include <memory>
 
 namespace mapnik
 {

src/webp_reader.cpp

@@ -21,7 +21,6 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/make_unique.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/image_reader.hpp>
 

src/wkb.cpp

@@ -21,7 +21,6 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/make_unique.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/wkb.hpp>

src/xml_tree.cpp

@@ -22,7 +22,6 @@
 
 //mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/make_unique.hpp>
 #include <mapnik/xml_tree.hpp>
 #include <mapnik/xml_attribute_cast.hpp>
 #include <mapnik/util/conversions.hpp>