diff options
Diffstat (limited to 'src/mbgl/map/vector_tile_data.cpp')
| -rw-r--r-- | src/mbgl/map/vector_tile_data.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp index 708ded02cc..3fe423b502 100644 --- a/src/mbgl/map/vector_tile_data.cpp +++ b/src/mbgl/map/vector_tile_data.cpp @@ -6,8 +6,6 @@ #include <mbgl/style/style.hpp> #include <mbgl/storage/file_source.hpp> -#include <sstream> - namespace mbgl { VectorTileData::VectorTileData(const TileID& id_, @@ -32,14 +30,10 @@ VectorTileData::VectorTileData(const TileID& id_, Seconds modified_, Seconds expires_) { if (err) { - try { - std::rethrow_exception(err); - } catch (const std::exception& e) { - error = e.what(); - state = State::obsolete; - callback(); - return; - } + error = err; + state = State::obsolete; + callback(); + return; } if (!tile) { @@ -86,9 +80,7 @@ VectorTileData::VectorTileData(const TileID& id_, redoPlacement(); } } else { - std::stringstream message; - message << "Failed to parse [" << std::string(id) << "]: " << result.get<std::string>(); - error = message.str(); + error = result.get<std::exception_ptr>(); state = State::obsolete; } @@ -130,9 +122,7 @@ bool VectorTileData::parsePending(std::function<void()> callback) { redoPlacement(); } } else { - std::stringstream message; - message << "Failed to parse [" << std::string(id) << "]: " << result.get<std::string>(); - error = message.str(); + error = result.get<std::exception_ptr>(); state = State::obsolete; } |