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

add explicit instantiation declarations to DEFINE_ENUM macro to fix -Wundefined-var-template warnings.

Browse source
This commit is contained in:
Artem Pavlenko 2018-04-16 11:10:54 +02:00
parent fe5c4bb978
commit b392b8214e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/enumeration.hpp
View file

@ -281,7 +281,10 @@ operator<<(std::ostream & os, const mapnik::enumeration<ENUM, THE_MAX> & e)
using name = enumeration<e, e ## _MAX>; using name = enumeration<e, e ## _MAX>;
#else #else
#define DEFINE_ENUM( name, e) \ #define DEFINE_ENUM( name, e) \
using name = enumeration<e, e ## _MAX>; using name = enumeration<e, e ## _MAX>; \
template <> MAPNIK_DECL const char ** name ::our_strings_; \
template <> MAPNIK_DECL std::string name ::our_name_; \
template <> MAPNIK_DECL bool name ::our_verified_flag_;
#endif #endif
/** Helper macro. Runs the verify_mapnik_enum() method during static initialization. /** Helper macro. Runs the verify_mapnik_enum() method during static initialization.