File mapnik-v3.0.19_compileerror.patch of Package mapnik

Overview Repositories Revisions Requests Users Attributes Meta

File mapnik-v3.0.19_compileerror.patch of Package mapnik (Revision 56cf416434a6aaf9ff290af787b5264f)

Currently displaying revision 56cf416434a6aaf9ff290af787b5264f , Show latest

diff -ur mapnik-v3.0.19/include/mapnik/text/symbolizer_helpers.hpp mapnik-v3.0.19_fix/include/mapnik/text/symbolizer_helpers.hpp
--- mapnik-v3.0.19/include/mapnik/text/symbolizer_helpers.hpp	2018-03-06 13:14:43.000000000 +0100
+++ mapnik-v3.0.19_fix/include/mapnik/text/symbolizer_helpers.hpp	2018-04-11 12:01:48.202588186 +0200
@@ -155,7 +155,7 @@
 protected:
     void init_converters();
     void initialize_points() const;
-    template <template <typename, typename> typename GridAdapter>
+    template <template <typename, typename> class GridAdapter>
     void initialize_grid_points() const;
     bool next_point_placement() const;
     bool next_line_placement() const;
diff -ur mapnik-v3.0.19/src/text/symbolizer_helpers.cpp mapnik-v3.0.19_fix/src/text/symbolizer_helpers.cpp
--- mapnik-v3.0.19/src/text/symbolizer_helpers.cpp	2018-03-06 13:14:43.000000000 +0100
+++ mapnik-v3.0.19_fix/src/text/symbolizer_helpers.cpp	2018-04-11 12:02:05.646014941 +0200
@@ -108,7 +108,7 @@
     proj_transform const& prj_trans_;
 };
 
-template <template <typename, typename> typename GridAdapter, typename T, typename Points>
+template <template <typename, typename> class GridAdapter, typename T, typename Points>
 struct grid_placement_finder_adapter
 {
     grid_placement_finder_adapter(T dx, T dy, Points & points, double scale_factor)
@@ -560,7 +560,7 @@
     finder_.set_marker(std::make_shared<marker_info>(marker, trans), bbox, unlock_image, marker_displacement);
 }
 
-template <template <typename, typename> typename GridAdapter>
+template <template <typename, typename> class GridAdapter>
 void text_symbolizer_helper::initialize_grid_points() const
 {
     for (auto const& geom : geometries_to_process_)

Places

File mapnik-v3.0.19_compileerror.patch of Package mapnik (Revision 56cf416434a6aaf9ff290af787b5264f)

Places