diff options
-rw-r--r-- | src/mbgl/geometry/glyph_atlas.cpp | 2 | ||||
-rw-r--r-- | test/api/api_misuse.cpp | 2 | ||||
-rw-r--r-- | test/style/style_parser.cpp | 2 | ||||
-rw-r--r-- | test/util/thread_local.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/geometry/glyph_atlas.cpp b/src/mbgl/geometry/glyph_atlas.cpp index f5b4d22cee..37e55c9952 100644 --- a/src/mbgl/geometry/glyph_atlas.cpp +++ b/src/mbgl/geometry/glyph_atlas.cpp @@ -52,7 +52,7 @@ Rect<uint16_t> GlyphAtlas::addGlyph(uintptr_t tileUID, const uint8_t buffer = 3; std::map<uint32_t, GlyphValue>& face = index[fontStack]; - std::map<uint32_t, GlyphValue>::iterator it = face.find(glyph.id); + auto it = face.find(glyph.id); // The glyph is already in this texture. if (it != face.end()) { diff --git a/test/api/api_misuse.cpp b/test/api/api_misuse.cpp index 2400550a68..e9fe307718 100644 --- a/test/api/api_misuse.cpp +++ b/test/api/api_misuse.cpp @@ -13,7 +13,7 @@ using namespace mbgl; TEST(API, RenderWithoutCallback) { - FixtureLogObserver* log = new FixtureLogObserver(); + auto log = new FixtureLogObserver(); Log::setObserver(std::unique_ptr<Log::Observer>(log)); util::RunLoop loop; diff --git a/test/style/style_parser.cpp b/test/style/style_parser.cpp index 7f8e534cf4..7590f32403 100644 --- a/test/style/style_parser.cpp +++ b/test/style/style_parser.cpp @@ -26,7 +26,7 @@ TEST_P(StyleParserTest, ParseStyle) { ASSERT_FALSE(infoDoc.HasParseError()); ASSERT_TRUE(infoDoc.IsObject()); - FixtureLogObserver* observer = new FixtureLogObserver(); + auto observer = new FixtureLogObserver(); Log::setObserver(std::unique_ptr<Log::Observer>(observer)); style::Parser parser; diff --git a/test/util/thread_local.cpp b/test/util/thread_local.cpp index 5233a1806f..d2ec7f70a5 100644 --- a/test/util/thread_local.cpp +++ b/test/util/thread_local.cpp @@ -80,8 +80,8 @@ TEST(ThreadLocalStorage, AutoReclaim) { unsigned counter = 0; - DtorCounter* dtorCounter1 = new DtorCounter{ &counter }; - DtorCounter* dtorCounter2 = new DtorCounter{ &counter }; + auto dtorCounter1 = new DtorCounter{ &counter }; + auto dtorCounter2 = new DtorCounter{ &counter }; ThreadContext context = {"Test"}; |