diff --git a/include/mapnik/text/symbolizer_helpers.hpp b/include/mapnik/text/symbolizer_helpers.hpp
index 92257308a..d10278621 100644
--- a/include/mapnik/text/symbolizer_helpers.hpp
+++ b/include/mapnik/text/symbolizer_helpers.hpp
@@ -155,7 +155,7 @@ public:
 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 --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index ed2f9141f..7d497613a 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -108,7 +108,7 @@ struct apply_vertex_placement
     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 @@ void text_symbolizer_helper::init_marker() const
     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_)