From: Noah Watkins <noahwatkins@gmail.com>
Date: Fri, 24 Jan 2014 04:13:57 +0000 (-0800)
Subject: libc++: convert tr1 uses
X-Git-Tag: v0.78~276^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1135%2Fhead;p=ceph.git

libc++: convert tr1 uses

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

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 025bad3370bf..b152f42b0f83 100644
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -18,6 +18,7 @@
 #include "OSD.h"
 #include "PGBackend.h"
 #include "osd_types.h"
+#include "../include/memory.h"
 
 struct C_ReplicatedBackend_OnPullComplete;
 class ReplicatedBackend : public PGBackend {
@@ -466,7 +467,7 @@ private:
     RepModify() : applied(false), committed(false), ackerosd(-1),
 		  epoch_started(0), bytes_written(0) {}
   };
-  typedef std::tr1::shared_ptr<RepModify> RepModifyRef;
+  typedef ceph::shared_ptr<RepModify> RepModifyRef;
 
   struct C_OSD_RepModifyApply : public Context {
     ReplicatedBackend *pg;
diff --git a/src/test/osd/Object.h b/src/test/osd/Object.h
index 06547457af2a..1f4defdcb67b 100644
--- a/src/test/osd/Object.h
+++ b/src/test/osd/Object.h
@@ -1,5 +1,4 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-#include <tr1/memory>
 #include "include/interval_set.h"
 #include "include/buffer.h"
 #include "include/encoding.h"
@@ -277,12 +276,12 @@ public:
   public:
     uint64_t pos;
     ObjectDesc &obj;
-    list<pair<list<pair<std::tr1::shared_ptr<ContentsGenerator>,
+    list<pair<list<pair<ceph::shared_ptr<ContentsGenerator>,
 			ContDesc> >::iterator,
 	      uint64_t> > stack;
     map<ContDesc,ContentsGenerator::iterator> cont_iters;
     uint64_t limit;
-    list<pair<std::tr1::shared_ptr<ContentsGenerator>,
+    list<pair<ceph::shared_ptr<ContentsGenerator>,
 	      ContDesc> >::iterator cur_cont;
     
     iterator(ObjectDesc &obj) :
@@ -349,7 +348,7 @@ public:
 
   uint64_t version;
 private:
-  list<pair<std::tr1::shared_ptr<ContentsGenerator>, ContDesc> > layers;
+  list<pair<ceph::shared_ptr<ContentsGenerator>, ContDesc> > layers;
 };
 
 #endif