diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/storage/response.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/util/enum.hpp | 3 | ||||
-rw-r--r-- | include/mbgl/util/event.hpp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/mbgl/storage/response.hpp b/include/mbgl/storage/response.hpp index c532b1216d..cead680aa5 100644 --- a/include/mbgl/storage/response.hpp +++ b/include/mbgl/storage/response.hpp @@ -54,6 +54,4 @@ public: Error(ResourceStatus, std::string = "", optional<Timestamp> = {}); }; -std::ostream& operator<<(std::ostream&, ResourceStatus); - } // namespace mbgl diff --git a/include/mbgl/util/enum.hpp b/include/mbgl/util/enum.hpp index 369ca86bfd..60d8e7ca69 100644 --- a/include/mbgl/util/enum.hpp +++ b/include/mbgl/util/enum.hpp @@ -3,7 +3,6 @@ #include <mbgl/util/optional.hpp> #include <algorithm> -#include <cassert> #include <string> namespace mbgl { @@ -23,7 +22,7 @@ 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; \ + return it == std::end(T##_names) ? "<invalid>" : it->second; \ } \ \ template <> \ diff --git a/include/mbgl/util/event.hpp b/include/mbgl/util/event.hpp index 5fe0baae3c..239b08aa90 100644 --- a/include/mbgl/util/event.hpp +++ b/include/mbgl/util/event.hpp @@ -28,6 +28,7 @@ enum class Event : uint8_t { Android, Crash, Glyph, + Resource, }; struct EventPermutation { |