librados: mark old object listing api deprecated

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 03ef16537404cb5d8f03c1d0375800b6c52a0a67..74883cec4ba0943eccc8c7c779476248a0012c3f 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -771,11 +771,11 @@ namespace librados
     const NObjectIterator& nobjects_end() const;
 
     // DEPRECATED
-    ObjectIterator objects_begin();
+    ObjectIterator objects_begin() __attribute__ ((deprecated));
     /// Start enumerating objects for a pool starting from a hash position
-    ObjectIterator objects_begin(uint32_t start_hash_position);
+    ObjectIterator objects_begin(uint32_t start_hash_position) __attribute__ ((deprecated));
     /// Iterator indicating the end of a pool
-    const ObjectIterator& objects_end() const;
+    const ObjectIterator& objects_end() const __attribute__ ((deprecated));
 
     /**
      * List available hit set objects

diff --git a/src/test/librados/list.cc b/src/test/librados/list.cc
index 11e89a931cb56115a2c32b060cc294c326f5961c..50d0d281882aeaf57bcec7a950c714f1f13fba67 100644 (file)
--- a/src/test/librados/list.cc
+++ b/src/test/librados/list.cc
@@ -34,6 +34,9 @@ TEST_F(LibRadosList, ListObjects) {
   rados_objects_list_close(ctx);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 TEST_F(LibRadosListPP, ListObjectsPP) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
@@ -150,6 +153,8 @@ static void check_list(std::set<std::string>& myset, rados_list_ctx_t& ctx)
   ASSERT_TRUE(myset.empty());
 }
 
+#pragma GCC diagnostic pop
+
 TEST_F(LibRadosList, ListObjectsNS) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
@@ -202,6 +207,9 @@ TEST_F(LibRadosList, ListObjectsNS) {
   ASSERT_EQ(-EINVAL, rados_objects_list_open(ioctx, &ctx));
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 static void check_listpp(std::set<std::string>& myset, IoCtx& ioctx)
 {
   ObjectIterator iter(ioctx.objects_begin());
@@ -465,6 +473,8 @@ TEST_F(LibRadosListECPP, ListObjectsEndIter) {
   ASSERT_TRUE(iter2 == iter_end2);
 }
 
+#pragma GCC diagnostic pop
+
 TEST_F(LibRadosListEC, ListObjectsNS) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
@@ -560,6 +570,9 @@ TEST_F(LibRadosListECPP, ListObjectsPPNS) {
   EXPECT_THROW(check_listpp(def, ioctx), std::runtime_error);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 TEST_F(LibRadosListECPP, ListObjectsManyPP) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
@@ -646,3 +659,5 @@ TEST_F(LibRadosListECPP, ListObjectsStartPP) {
     ++p;
   }
 }
+
+#pragma GCC diagnostic pop