summaryrefslogtreecommitdiff
path: root/include/llmr/map/source.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-06-27 15:52:45 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-06-27 15:52:45 +0200
commit6d9de7573202d4b2332667f2d685a0e73e7c0f52 (patch)
treebce1907e03c9789a7160295859796b6416004d11 /include/llmr/map/source.hpp
parent6de9d9769e601284347b73231d286dc645ee1b67 (diff)
downloadqtlocation-mapboxgl-6d9de7573202d4b2332667f2d685a0e73e7c0f52.tar.gz
rename time => timestamp to avoid naming conflicts
Diffstat (limited to 'include/llmr/map/source.hpp')
-rw-r--r--include/llmr/map/source.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llmr/map/source.hpp b/include/llmr/map/source.hpp
index c272508584..93dabdc7c4 100644
--- a/include/llmr/map/source.hpp
+++ b/include/llmr/map/source.hpp
@@ -58,7 +58,7 @@ private:
private:
// Stores the time when this source was most recently updated.
- time updated = 0;
+ timestamp updated = 0;
std::map<Tile::ID, std::unique_ptr<Tile>> tiles;
std::map<Tile::ID, std::weak_ptr<TileData>> tile_data;