libc++: convert tr1 uses

Signed-off-by: Noah Watkins <[email protected]>
eile · Jan 24, 2014 · faae5b9 · faae5b9
1 parent ea026c6
commit faae5b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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 @@ class ReplicatedBackend : public PGBackend {
     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
@@ -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 @@ class ObjectDesc {
   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 @@ class ObjectDesc {
 
   uint64_t version;
 private:
-  list<pair<std::tr1::shared_ptr<ContentsGenerator>, ContDesc> > layers;
+  list<pair<ceph::shared_ptr<ContentsGenerator>, ContDesc> > layers;
 };
 
 #endif