diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-09 15:10:24 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-28 10:13:35 -0700 |
| commit | 348cffa1195e605d8012c2339a2b480727b59fba (patch) | |
| tree | 2819516580b838867ac99fd8d8fcfe9b1a555d60 | |
| parent | f169577aab74c9c4f23ed9d1c93b8a1fa605ce33 (diff) | |
| download | qtlocation-mapboxgl-348cffa1195e605d8012c2339a2b480727b59fba.tar.gz | |
[core] Avoid -Wundefined-var-template warnings with clang 3.9+
| -rw-r--r-- | include/mbgl/util/enum.hpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/include/mbgl/util/enum.hpp b/include/mbgl/util/enum.hpp index 48ffda463e..369ca86bfd 100644 --- a/include/mbgl/util/enum.hpp +++ b/include/mbgl/util/enum.hpp @@ -11,26 +11,26 @@ namespace mbgl { template <typename T> class Enum { public: - using Value = std::pair<const T, const char *>; - - static const char * toString(T t) { - auto it = std::find_if(begin, end, [&] (const auto& v) { return t == v.first; }); - assert(it != end); return it->second; - } - - static optional<T> toEnum(const std::string& s) { - auto it = std::find_if(begin, end, [&] (const auto& v) { return s == v.second; }); - return it == end ? optional<T>() : it->first; - } - -private: - static const Value* begin; - static const Value* end; + static const char * toString(T); + static optional<T> toEnum(const std::string&); }; -#define MBGL_DEFINE_ENUM(type, strings...) \ -const constexpr Enum<type>::Value type##_names[] = strings; \ -template <> const Enum<type>::Value* Enum<type>::begin = std::begin(type##_names); \ -template <> const Enum<type>::Value* Enum<type>::end = std::end(type##_names) +#define MBGL_DEFINE_ENUM(T, values...) \ + \ +static const constexpr std::pair<const T, const char *> T##_names[] = values; \ + \ +template <> \ +const char * Enum<T>::toString(T t) { \ + auto it = std::find_if(std::begin(T##_names), std::end(T##_names), \ + [&] (const auto& v) { return t == v.first; }); \ + assert(it != std::end(T##_names)); return it->second; \ +} \ + \ +template <> \ +optional<T> Enum<T>::toEnum(const std::string& s) { \ + auto it = std::find_if(std::begin(T##_names), std::end(T##_names), \ + [&] (const auto& v) { return s == v.second; }); \ + return it == std::end(T##_names) ? optional<T>() : it->first; \ +} } // namespace mbgl |