Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compiler errors #4370

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion SConstruct
Expand Up @@ -2071,7 +2071,7 @@ if not preconfigured:
# Common flags for g++/clang++ CXX compiler.
# TODO: clean up code more to make -Wextra -Wsign-compare -Wsign-conversion -Wconversion viable
# -Wfloat-equal -Wold-style-cast -Wexit-time-destructors -Wglobal-constructors -Wreserved-id-macro -Wheader-hygiene -Wmissing-noreturn
common_cxx_flags = '-fvisibility=hidden -fvisibility-inlines-hidden -Wall %s %s -ftemplate-depth-300 -Wsign-compare ' % (env['WARNING_CXXFLAGS'], pthread)
common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 -Wsign-compare ' % (env['WARNING_CXXFLAGS'], pthread)

if 'clang++' in env['CXX']:
common_cxx_flags += ' -Wno-unsequenced -Wtautological-compare -Wheader-hygiene '
Expand Down
1 change: 1 addition & 0 deletions include/mapnik/agg_renderer.hpp
Expand Up @@ -196,6 +196,7 @@ class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T0>
void setup(Map const& m, buffer_type& pixmap);
};

extern template class MAPNIK_DECL feature_style_processor<agg_renderer<image_rgba8>>;
extern template class MAPNIK_DECL agg_renderer<image<rgba8_t>>;

} // namespace mapnik
Expand Down
1 change: 1 addition & 0 deletions include/mapnik/cairo/cairo_renderer.hpp
Expand Up @@ -137,6 +137,7 @@ class MAPNIK_DECL cairo_renderer : public feature_style_processor<cairo_renderer
void setup(Map const& m);
};

extern template class MAPNIK_DECL feature_style_processor<cairo_renderer<cairo_ptr>>;
extern template class MAPNIK_DECL cairo_renderer<cairo_ptr>;

} // namespace mapnik
Expand Down
2 changes: 1 addition & 1 deletion include/mapnik/feature_style_processor.hpp
Expand Up @@ -47,7 +47,7 @@ struct layer_rendering_material;
enum eAttributeCollectionPolicy { DEFAULT = 0, COLLECT_ALL = 1 };

template<typename Processor>
class feature_style_processor
class MAPNIK_DECL feature_style_processor
{
public:
explicit feature_style_processor(Map const& m, double scale_factor = 1.0);
Expand Down