libc++: use ceph::shared_ptr in installed header

librados.hpp uses std::tr1::shared_ptr which may not be available such
as in libc++. This switches the use to ceph::shared_ptr and as a result
also ships include/memory.h for the definition.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 80cf9b3f66120a1a8db7ef579ab85e9d08e19f8e..bcc411f8cbf5bfbfa43c7c8a945aad5bd08765a8 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -508,6 +508,7 @@ fi
 %{_includedir}/rados/crc32c.h
 %{_includedir}/rados/rados_types.h
 %{_includedir}/rados/rados_types.hpp
+%{_includedir}/rados/memory.h
 %dir %{_includedir}/rbd
 %{_includedir}/rbd/librbd.h
 %{_includedir}/rbd/librbd.hpp

diff --git a/debian/librados-dev.install b/debian/librados-dev.install
index 230f4070ec65104e9b566ff4ef6d26c536aa9472..49aa0ddccaf3bbf5151c9d78af9a69772ce23ff1 100644 (file)
--- a/debian/librados-dev.install
+++ b/debian/librados-dev.install
@@ -6,6 +6,7 @@ usr/include/rados/librados.hpp
 usr/include/rados/page.h
 usr/include/rados/rados_types.h
 usr/include/rados/rados_types.hpp
+usr/include/rados/memory.h
 usr/lib/librados.a
 usr/lib/librados.la
 usr/lib/librados.so

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index ab1f58c18f03ca726326edd6eb543dc2b366c914..62cd62ca2052a22e4240a10830e0454b4eaf5424 100644 (file)
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -15,7 +15,8 @@ rados_include_DATA = \
        $(srcdir)/include/rados/librados.hpp \
        $(srcdir)/include/buffer.h \
        $(srcdir)/include/page.h \
-       $(srcdir)/include/crc32c.h
+       $(srcdir)/include/crc32c.h \
+       $(srcdir)/include/memory.h
 
 noinst_HEADERS += \
        include/Context.h \
@@ -83,6 +84,7 @@ noinst_HEADERS += \
        include/stat.h \
        include/on_exit.h \
        include/memory.h \
+       include/rados/memory.h \
        include/hash_namespace.h \
        include/unordered_set.h \
        include/unordered_map.h

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 009c81baca93e5537d59e9ccd4d05bc2c516c238..6b059febb33c0003d4f12af8b44adf3787d29bf4 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -6,9 +6,9 @@
 #include <list>
 #include <map>
 #include <set>
-#include <tr1/memory>
 #include <vector>
 #include <utility>
+#include "memory.h"
 #include "buffer.h"
 
 #include "librados.h"
@@ -80,7 +80,7 @@ namespace librados
 
   private:
     void get_next();
-    std::tr1::shared_ptr < ObjListCtx > ctx;
+    ceph::shared_ptr < ObjListCtx > ctx;
     std::pair<std::string, std::string> cur_obj;
   };
 

diff --git a/src/include/rados/memory.h b/src/include/rados/memory.h
new file mode 120000 (symlink)
index 0000000..6bdcc98
--- /dev/null
+++ b/src/include/rados/memory.h
@@ -0,0 +1 @@
+../memory.h
\ No newline at end of file