diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-30 17:01:54 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-30 17:43:37 -0700 |
| commit | 5eda74a514964d1cac684483bafa08d458175f9a (patch) | |
| tree | a38f886f5742d52a915c3c72959a5eba50b9fa0e /include | |
| parent | b6a181097c3e7c3168be3575d5d7e95820fc74ba (diff) | |
| parent | 7b5a1ca1670a0346cdbf2af689fabde4e70ed561 (diff) | |
| download | qtlocation-mapboxgl-5eda74a514964d1cac684483bafa08d458175f9a.tar.gz | |
Merge branch 'release-ios-3.2.0-android-4.0.0'
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/map.hpp | 1 | ||||
| -rw-r--r-- | include/mbgl/util/string.hpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index c85e7eae38..9d586d8b8a 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -199,6 +199,7 @@ private: }; RenderState renderState = RenderState::never; + bool loading = false; }; } // namespace mbgl diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp index 6c2433534e..51ee848f22 100644 --- a/include/mbgl/util/string.hpp +++ b/include/mbgl/util/string.hpp @@ -28,6 +28,12 @@ inline std::string toString(uint8_t num) { } inline std::string toString(std::exception_ptr error) { + assert(error); + + if (!error) { + return "(null)"; + } + try { std::rethrow_exception(error); } catch (const std::exception& ex) { |