diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-13 16:34:33 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-14 16:28:12 -0600 |
commit | b18a4d6e7804a7f919cd038b50f8a77c748778b1 (patch) | |
tree | ce7a45d5f008379e196f30fbed4d53392180c39c /src | |
parent | d819ece74c52658c68d4e297c9bef5a74f739e28 (diff) | |
download | qtlocation-mapboxgl-b18a4d6e7804a7f919cd038b50f8a77c748778b1.tar.gz |
[core] Mutex no longer needs to be recursive
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index b712fc8742..81a8013e86 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -119,19 +119,19 @@ void SpriteAtlas::dumpDebugLogs() const { } void SpriteAtlas::setSprites(const Sprites& newSprites) { - std::lock_guard<std::recursive_mutex> lock(mutex); + std::lock_guard<std::mutex> lock(mutex); for (const auto& pair : newSprites) { _setSprite(pair.first, pair.second); } } void SpriteAtlas::setSprite(const std::string& name, std::shared_ptr<const SpriteImage> sprite) { - std::lock_guard<std::recursive_mutex> lock(mutex); + std::lock_guard<std::mutex> lock(mutex); _setSprite(name, sprite); } void SpriteAtlas::removeSprite(const std::string& name) { - std::lock_guard<std::recursive_mutex> lock(mutex); + std::lock_guard<std::mutex> lock(mutex); auto it = entries.find(name); if (it == entries.end()) { @@ -179,7 +179,7 @@ void SpriteAtlas::_setSprite(const std::string& name, } std::shared_ptr<const SpriteImage> SpriteAtlas::getSprite(const std::string& name) { - std::lock_guard<std::recursive_mutex> lock(mutex); + std::lock_guard<std::mutex> lock(mutex); const auto it = entries.find(name); if (it != entries.end()) { return it->second.spriteImage; @@ -193,7 +193,7 @@ std::shared_ptr<const SpriteImage> SpriteAtlas::getSprite(const std::string& nam optional<SpriteAtlasElement> SpriteAtlas::getImage(const std::string& name, const SpritePatternMode mode) { - std::lock_guard<std::recursive_mutex> lock(mutex); + std::lock_guard<std::mutex> lock(mutex); auto it = entries.find(name); if (it == entries.end()) { diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 124d0ae294..10ef2ddaa9 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -111,7 +111,7 @@ private: optional<Rect<uint16_t>> patternRect; }; - std::recursive_mutex mutex; + std::mutex mutex; std::unordered_map<std::string, Entry> entries; BinPack<uint16_t> bin; PremultipliedImage image; |