sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3882 from mapycz/fix-grid-placement-nested-template

Browse source 
v3.0.x: fix compiler warning
This commit is contained in:
Artem Pavlenko 2018-04-11 10:29:18 +02:00 committed by GitHub
commit d1f041dad0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/text/symbolizer_helpers.hpp
View file

@ -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;

4
src/text/symbolizer_helpers.cpp
View file

@ -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_)