summaryrefslogtreecommitdiff
path: root/src/mbgl/tile
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-05-10 18:51:04 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-05-12 18:07:36 +0300
commitfa36110dfbdc05b511a3f85461eaca4a29e446a1 (patch)
tree284bd9a9eca229c026e531bbce1a9f0dd6ba089d /src/mbgl/tile
parentf709d7b0557d3e6d652d9b7d8380f1380962a327 (diff)
downloadqtlocation-mapboxgl-fa36110dfbdc05b511a3f85461eaca4a29e446a1.tar.gz
[tidy] modernize-use-auto
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r--src/mbgl/tile/vector_tile.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index 46914e5f5a..d22617dd07 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -162,7 +162,7 @@ optional<Value> VectorTileFeature::getValue(const std::string& key) const {
auto start_itr = tags_iter.begin();
const auto & end_itr = tags_iter.end();
while (start_itr != end_itr) {
- uint32_t tag_key = static_cast<uint32_t>(*start_itr++);
+ auto tag_key = static_cast<uint32_t>(*start_itr++);
if (layerData->keysMap.size() <= tag_key) {
throw std::runtime_error("feature referenced out of range key");
@@ -172,7 +172,7 @@ optional<Value> VectorTileFeature::getValue(const std::string& key) const {
throw std::runtime_error("uneven number of feature tag ids");
}
- uint32_t tag_val = static_cast<uint32_t>(*start_itr++);;
+ auto tag_val = static_cast<uint32_t>(*start_itr++);;
if (layerData->values.size() <= tag_val) {
throw std::runtime_error("feature referenced out of range value");
}
@@ -190,11 +190,11 @@ std::unordered_map<std::string,Value> VectorTileFeature::getProperties() const {
auto start_itr = tags_iter.begin();
const auto & end_itr = tags_iter.end();
while (start_itr != end_itr) {
- uint32_t tag_key = static_cast<uint32_t>(*start_itr++);
+ auto tag_key = static_cast<uint32_t>(*start_itr++);
if (start_itr == end_itr) {
throw std::runtime_error("uneven number of feature tag ids");
}
- uint32_t tag_val = static_cast<uint32_t>(*start_itr++);
+ auto tag_val = static_cast<uint32_t>(*start_itr++);
properties[layerData->keys.at(tag_key)] = layerData->values.at(tag_val);
}
return properties;
@@ -219,7 +219,7 @@ GeometryCollection VectorTileFeature::getGeometries() const {
auto g_itr = geometry_iter.begin();
while (g_itr != geometry_iter.end()) {
if (length == 0) {
- uint32_t cmd_length = static_cast<uint32_t>(*g_itr++);
+ auto cmd_length = static_cast<uint32_t>(*g_itr++);
cmd = cmd_length & 0x7;
length = cmd_length >> 3;
}