From: Noah Watkins <noahwatkins@gmail.com>
Date: Fri, 21 Feb 2014 21:00:09 +0000 (-0800)
Subject: osd: use ceph scoped shared_ptr
X-Git-Tag: v0.78~141^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5373ee24ba58f580d4839f435410256b4ba61666;p=ceph.git

osd: use ceph scoped shared_ptr

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/src/osd/ECUtil.h b/src/osd/ECUtil.h
index 4952ed8be34..8c4e8cb9c34 100644
--- a/src/osd/ECUtil.h
+++ b/src/osd/ECUtil.h
@@ -18,7 +18,7 @@
 #include <map>
 #include <set>
 
-#include <memory>
+#include "include/memory.h"
 #include "erasure-code/ErasureCodeInterface.h"
 #include "include/buffer.h"
 #include "include/assert.h"
@@ -144,7 +144,7 @@ public:
     return total_chunk_size;
   }
 };
-typedef std::tr1::shared_ptr<HashInfo> HashInfoRef;
+typedef ceph::shared_ptr<HashInfo> HashInfoRef;
 
 bool is_hinfo_key_string(const string &key);
 const string &get_hinfo_key();