From 84c3191044362a9bb6742d3fc24b46af7efa9171 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 26 Nov 2014 16:04:22 -0800 Subject: [PATCH] Eliminate Map::getActiveSources() --- include/mbgl/map/map.hpp | 1 - src/map/map.cpp | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 8df4e91a5..f29c8f1df 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -71,7 +71,6 @@ public: void resize(uint16_t width, uint16_t height, float ratio, uint16_t fb_width, uint16_t fb_height); // Styling - const std::set> getActiveSources() const; void setAppliedClasses(const std::vector &classes); void toggleClass(const std::string &name); const std::vector &getAppliedClasses() const; diff --git a/src/map/map.cpp b/src/map/map.cpp index 22eb0de69..c6d376c13 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -621,10 +621,6 @@ void Map::updateSources() { }); } -const std::set> Map::getActiveSources() const { - return activeSources; -} - void Map::updateSources(const util::ptr &group) { if (!group) { return; @@ -642,7 +638,7 @@ void Map::updateSources(const util::ptr &group) { } void Map::updateTiles() { - for (const util::ptr &source : getActiveSources()) { + for (const auto& source : activeSources) { source->source->update(*this, getWorker(), style, glyphAtlas, *glyphStore, spriteAtlas, getSprite(),