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

+ remove namespace qualifier from DEFINE_ENUM

Browse source 
macro to keep clang++ 3.0 happy
This commit is contained in:
Artem Pavlenko 2011-03-21 15:24:04 +00:00
parent 3f219a7046
commit 9abfc24219
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/mapnik/enumeration.hpp
View file

@ -314,21 +314,15 @@ operator>>(std::istream & is, mapnik::enumeration<ENUM, THE_MAX> & e)
* @relates mapnik::enumeration
*/
#define DEFINE_ENUM( name, e) \
typedef mapnik::enumeration<e, e ## _MAX> name
typedef enumeration<e, e ## _MAX> name
/** Helper macro. Runs the verify() method during static initialization.
* @relates mapnik::enumeration
*/
#if defined __clang__
#define IMPLEMENT_ENUM( name, strings ) \
const char ** name ::our_strings_ = strings; \
std::string name ::our_name_ = #name; \
bool name ::our_verified_flag_( name ::verify(__FILE__, __LINE__));
#else
#define IMPLEMENT_ENUM( name, strings ) \
template <> const char ** name ::our_strings_ = strings; \
template <> std::string name ::our_name_ = #name; \
template <> bool name ::our_verified_flag_( name ::verify(__FILE__, __LINE__));
#endif
#endif // MAPNIK_ENUMERATION_INCLUDED