From 9ff0d009124a4b114c0199cc5ef03a87759103a1 Mon Sep 17 00:00:00 2001 From: artemp Date: Wed, 29 Oct 2014 18:12:11 -0400 Subject: [PATCH] store uv::loop as unique_ptr --- include/mbgl/map/map.hpp | 3 +-- src/map/map.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 382b6745d..6aa86fcc8 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -134,7 +134,6 @@ public: inline SpriteAtlas & getSpriteAtlas() { return spriteAtlas; } util::ptr getSprite(); inline util::ptr getTexturepool() { return texturepool; } - inline util::ptr getLoop() { return loop; } uv::worker &getWorker(); inline timestamp getAnimationTime() const { return animationTime; } inline timestamp getTime() const { return animationTime; } @@ -163,7 +162,7 @@ private: private: bool async = false; - util::ptr loop; + std::unique_ptr loop; std::unique_ptr workers; std::unique_ptr thread; std::unique_ptr async_terminate; diff --git a/src/map/map.cpp b/src/map/map.cpp index f9976b4e1..ad8248476 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -31,7 +31,7 @@ using namespace mbgl; Map::Map(View& view_) - : loop(std::make_shared()), + : loop(std::make_unique()), thread(std::make_unique()), async_terminate(new uv_async_t()), async_render(new uv_async_t()),