Merge branch 'master' of github.com:mapnik/mapnik

config-cpp03-libstdcpp-x86_64-macosx.py

@@ -0,0 +1,33 @@
+# cpp03-libstdcpp-x86_64-macosx
+#
+# Forcing stdlib is the key for this platform.
+
+CUSTOM_CXXFLAGS = '-fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1 -stdlib=libstdc++'
+CUSTOM_LDFLAGS = '-stdlib=libstdc++'
+RUNTIME_LINK = 'static'
+INPUT_PLUGINS = 'csv,gdal,geojson,occi,ogr,osm,postgis,python,raster,rasterlite,shape,sqlite'
+WARNING_CXXFLAGS = '-Wno-deprecated-register -Wno-redeclared-class-member'
+PATH = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/bin/'
+BOOST_INCLUDES = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/include/boost'
+BOOST_LIBS = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/lib'
+BOOST_PYTHON_LIB = 'boost_python-2.7'
+FREETYPE_CONFIG = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/bin/freetype-config'
+ICU_INCLUDES = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/include'
+ICU_LIBS = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/lib'
+PNG_INCLUDES = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/include'
+PNG_LIBS = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/lib'
+JPEG_INCLUDES = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/include'
+JPEG_LIBS = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/lib'
+TIFF_INCLUDES = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/include'
+TIFF_LIBS = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/lib'
+PROJ_INCLUDES = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/include'
+PROJ_LIBS = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/lib'
+BENCHMARK = True
+CAIRO_INCLUDES = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/include'
+CAIRO_LIBS = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/lib'
+SQLITE_INCLUDES = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/include'
+SQLITE_LIBS = '../mapnik-packaging/osx/out/build-cpp03-libstdcpp-x86_64-macosx/lib'
+FRAMEWORK_PYTHON = False
+BINDINGS = 'python'
+XMLPARSER = 'ptree'
+

include/mapnik/color.hpp

@@ -97,10 +97,12 @@ public:
     {
         return green_;
     }
+
     inline std::uint8_t blue() const
     {
         return blue_;
     }
+
     inline std::uint8_t alpha() const
     {
         return alpha_;
@@ -110,6 +112,7 @@ public:
     {
         red_ = red;
     }
+
     inline void set_green(std::uint8_t green)
     {
         green_ = green;

include/mapnik/make_unique.hpp

@@ -20,19 +20,19 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_STD_HPP
+#ifndef MAPNIK_MAKE_UNIQUE_HPP
-#define MAPNIK_STD_HPP
+#define MAPNIK_MAKE_UNIQUE_HPP
 
 #include <memory>
 
-namespace std {
+namespace mapnik {
 
 // C++14 backfill from http://herbsutter.com/gotw/_102/
 template<typename T, typename ...Args>
-inline ::std::unique_ptr<T> make_unique(Args&& ...args) {
+inline std::unique_ptr<T> make_unique(Args&& ...args) {
-    return ::std::unique_ptr<T>(new T(::std::forward<Args>(args)...));
+    return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
 }
 
 }
 
-#endif
+#endif // MAPNIK_MAKE_UNIQUE_HPP

include/mapnik/util/geometry_to_wkb.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_TO_WKB_HPP
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
 

plugins/input/gdal/gdal_featureset.cpp

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

plugins/input/osm/osm_featureset.cpp

@@ -1,4 +1,3 @@
-
 /*****************************************************************************
  *
  * This file is part of Mapnik (c++ mapping toolkit)
@@ -22,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>

plugins/input/shape/shape_datasource.cpp

@@ -31,7 +31,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/utils.hpp>

plugins/input/shape/shape_io.cpp

@@ -24,7 +24,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/geom_util.hpp>
 

src/agg/process_building_symbolizer.cpp

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

src/cairo/cairo_renderer.cpp

@@ -23,7 +23,7 @@
 #if defined(HAVE_CAIRO)
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/rule.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/layer.hpp>

src/grid/process_building_symbolizer.cpp

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

src/webp_reader.cpp

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

src/wkb.cpp

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

src/xml_tree.cpp

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 //mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/xml_tree.hpp>
 #include <mapnik/xml_attribute_cast.hpp>
 #include <mapnik/util/conversions.hpp>

tests/cpp_tests/fontset_runtime_test.cpp

@@ -21,7 +21,7 @@
 #include <mapnik/symbolizer.hpp>
 #include <vector>
 #include <algorithm>
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 
 #include "utils.hpp"