From 76f8a3d8468c623956c291ac7837e322b317a8f3 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Tue, 17 Mar 2015 17:45:09 -0700
Subject: [PATCH] fix passing of annotation manager

---
 src/mbgl/map/live_tile_data.cpp | 4 ++--
 src/mbgl/map/live_tile_data.hpp | 4 ++--
 src/mbgl/map/source.cpp         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mbgl/map/live_tile_data.cpp b/src/mbgl/map/live_tile_data.cpp
index 34743f02c..92777f67f 100644
--- a/src/mbgl/map/live_tile_data.cpp
+++ b/src/mbgl/map/live_tile_data.cpp
@@ -8,7 +8,7 @@
 using namespace mbgl;
 
 LiveTileData::LiveTileData(Tile::ID const& id_,
-                           util::ptr<AnnotationManager> annotationManager_,
+                           AnnotationManager& annotationManager_,
                            float mapMaxZoom,
                            util::ptr<Style> style_,
                            GlyphAtlas& glyphAtlas_,
@@ -37,7 +37,7 @@ void LiveTileData::parse() {
         }
 
         if (source.type == SourceType::Annotations) {
-            const std::unique_ptr<LiveTile>& tile = annotationManager->getTile(id);
+            const std::unique_ptr<LiveTile>& tile = annotationManager.getTile(id);
 
             if (tile) {
                 // Parsing creates state that is encapsulated in TileParser. While parsing,
diff --git a/src/mbgl/map/live_tile_data.hpp b/src/mbgl/map/live_tile_data.hpp
index 11530ef84..6b9d0a047 100644
--- a/src/mbgl/map/live_tile_data.hpp
+++ b/src/mbgl/map/live_tile_data.hpp
@@ -10,7 +10,7 @@ class AnnotationManager;
 class LiveTileData : public VectorTileData {
 public:
     LiveTileData(Tile::ID const&,
-                 util::ptr<AnnotationManager>,
+                 AnnotationManager&,
                  float mapMaxZoom,
                  util::ptr<Style>,
                  GlyphAtlas&,
@@ -24,7 +24,7 @@ public:
     void parse() override;
 
 private:
-    util::ptr<AnnotationManager> annotationManager;
+    AnnotationManager& annotationManager;
 };
 
 }
diff --git a/src/mbgl/map/source.cpp b/src/mbgl/map/source.cpp
index 982b084e1..b13a76c20 100644
--- a/src/mbgl/map/source.cpp
+++ b/src/mbgl/map/source.cpp
@@ -196,7 +196,7 @@ TileData::State Source::addTile(Map &map, Environment &env, uv::worker &worker,
             new_tile.data = std::make_shared<RasterTileData>(normalized_id, texturePool, info, env);
             new_tile.data->request(worker, map.getState().getPixelRatio(), callback);
         } else if (info.type == SourceType::Annotations) {
-            util::ptr<AnnotationManager> annotationManager = map.getAnnotationManager();
+            AnnotationManager& annotationManager = map.getAnnotationManager();
             new_tile.data = std::make_shared<LiveTileData>(normalized_id,
                                                            annotationManager,
                                                            map.getMaxZoom(), style,