diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-22 15:10:24 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-23 12:50:42 -0800 |
commit | 16de579d7cfc2960793cbcb5e95741f22ab73768 (patch) | |
tree | b4c3b7651f605e3d3dd61b469f61036bd2c4dcc3 /include | |
parent | 7bd4745cf10c504a4899a37016e87bce45e51472 (diff) | |
download | qtlocation-mapboxgl-16de579d7cfc2960793cbcb5e95741f22ab73768.tar.gz |
[core] Rationalize error handling for resource loading
* Standardize on std::exception_ptr as the error representation
(fixes #2854).
* Don't format textual strings at the error source; pass on the
constituent data via observer method parameters instead.
* Use the null object pattern to simplify observer notification code.
* Further refactoring for ResourceLoading tests.
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/util/exception.hpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/mbgl/util/exception.hpp b/include/mbgl/util/exception.hpp index 06098840a8..b2214b36b8 100644 --- a/include/mbgl/util/exception.hpp +++ b/include/mbgl/util/exception.hpp @@ -16,11 +16,6 @@ struct SpriteImageException : Exception { inline SpriteImageException(const std::string &msg) : Exception(msg) {} }; -struct GlyphRangeLoadingException : Exception { - inline GlyphRangeLoadingException(const char *msg) : Exception(msg) {} - inline GlyphRangeLoadingException(const std::string &msg) : Exception(msg) {} -}; - struct MisuseException : Exception { inline MisuseException(const char *msg) : Exception(msg) {} inline MisuseException(const std::string &msg) : Exception(msg) {} @@ -31,21 +26,6 @@ struct ShaderException : Exception { inline ShaderException(const std::string &msg) : Exception(msg) {} }; -struct SourceLoadingException : Exception { - inline SourceLoadingException(const char *msg) : Exception(msg) {} - inline SourceLoadingException(const std::string &msg) : Exception(msg) {} -}; - -struct SpriteLoadingException : Exception { - inline SpriteLoadingException(const char *msg) : Exception(msg) {} - inline SpriteLoadingException(const std::string &msg) : Exception(msg) {} -}; - -struct TileLoadingException : Exception { - inline TileLoadingException(const char *msg) : Exception(msg) {} - inline TileLoadingException(const std::string &msg) : Exception(msg) {} -}; - } // namespace util } // namespace mbgl |