summaryrefslogtreecommitdiff
path: root/src/mbgl/sprite
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-08-26 13:46:54 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-15 14:05:23 +0200
commitd1d523686c01aacee1f1f9b6f6c7f22a6ff54d14 (patch)
tree45e6209ce30bf0e78d8b8690ead61e93befeb0a3 /src/mbgl/sprite
parentd6c958ba5fab8318be09d0c60a2eccd9ccbd7186 (diff)
downloadqtlocation-mapboxgl-d1d523686c01aacee1f1f9b6f6c7f22a6ff54d14.tar.gz
[core] upgrade RapidJSON to 1.1.0
Diffstat (limited to 'src/mbgl/sprite')
-rw-r--r--src/mbgl/sprite/sprite_parser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/sprite/sprite_parser.cpp b/src/mbgl/sprite/sprite_parser.cpp
index 190ac66e14..34b1d875b6 100644
--- a/src/mbgl/sprite/sprite_parser.cpp
+++ b/src/mbgl/sprite/sprite_parser.cpp
@@ -108,9 +108,9 @@ SpriteParseResult parseSprite(const std::string& image, const std::string& json)
} else if (!doc.IsObject()) {
return std::make_exception_ptr(std::runtime_error("Sprite JSON root must be an object"));
} else {
- for (JSValue::ConstMemberIterator itr = doc.MemberBegin(); itr != doc.MemberEnd(); ++itr) {
- const std::string name = { itr->name.GetString(), itr->name.GetStringLength() };
- const JSValue& value = itr->value;
+ for (const auto& property : doc.GetObject()) {
+ const std::string name = { property.name.GetString(), property.name.GetStringLength() };
+ const JSValue& value = property.value;
if (value.IsObject()) {
const uint16_t x = getUInt16(value, "x", 0);