From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 21 Sep 2018 16:41:39 +0000 (-0400)
Subject: common: drop BL_BACKWARD_COMPAT in bufferlist.
X-Git-Tag: 3.2-0~69^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d5fbe7030b65dc5fffc674d7f088ff70645b4f6;p=ceph-ci.git

common: drop BL_BACKWARD_COMPAT in bufferlist.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index d172bc0939f..09b0c994505 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -848,16 +848,6 @@ using namespace ceph;
   buffer::list::iterator_impl<is_const>::iterator_impl(const buffer::list::iterator& i)
     : iterator_impl<is_const>(i.bl, i.off, i.p, i.p_off) {}
 
-#ifdef BL_BACKWARD_COMPAT
-  /// The backward iteration over is bufferlist is DEPRECATED!
-  /// The old int-taking variant of advance() is solely for compatibility.
-  template<bool is_const>
-  void buffer::list::iterator_impl<is_const>::advance(int o)
-  {
-    seek(off + o);
-  }
-#endif // BL_BACKWARD_COMPAT
-
   template<bool is_const>
   void buffer::list::iterator_impl<is_const>::advance(unsigned o)
   {
@@ -1084,15 +1074,6 @@ using namespace ceph;
     : iterator_impl(l, o, ip, po)
   {}
 
-#ifdef BL_BACKWARD_COMPAT
-  /// The backward iteration over is bufferlist is DEPRECATED!
-  /// The old int-taking variant of advance() is solely for compatibility.
-  void buffer::list::iterator::advance(int o)
-  {
-    seek(off + o);
-  }
-#endif // BL_BACKWARD_COMPAT
-
   void buffer::list::iterator::advance(unsigned o)
   {
     buffer::list::iterator_impl<false>::advance(o);
diff --git a/src/include/buffer.h b/src/include/buffer.h
index 332e67a72f3..b51b64d7583 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -438,12 +438,7 @@ namespace buffer CEPH_BUFFER_API {
 	//return off == bl->length();
       }
 
-#ifdef BL_BACKWARD_COMPAT
-      void advance(int o);
-#else
       void advance(int o) = delete;
-#endif // BL_BACKWARD_COMPAT
-
       void advance(unsigned o);
       void advance(size_t o) { advance(static_cast<unsigned>(o)); }
       void seek(unsigned o);
@@ -491,12 +486,7 @@ namespace buffer CEPH_BUFFER_API {
       iterator(bl_t *l, unsigned o=0);
       iterator(bl_t *l, unsigned o, list_iter_t ip, unsigned po);
 
-#ifdef BL_BACKWARD_COMPAT
-      void advance(int o);
-#else
       void advance(int o) = delete;
-#endif // BL_BACKWARD_COMPAT
-
       void advance(unsigned o);
       void advance(size_t o) { advance(static_cast<unsigned>(o)); }
 
diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc
index a856c205eab..d7a82b52132 100644
--- a/src/test/bufferlist.cc
+++ b/src/test/bufferlist.cc
@@ -810,10 +810,6 @@ TEST(BufferListIterator, constructors) {
     EXPECT_EQ('B', *i);
     EXPECT_EQ('C', *j);
     bl.c_str()[1] = 'X';
-#ifdef BL_BACKWARD_COMPAT
-    j.advance(-1);
-    EXPECT_EQ('X', *j);
-#endif // BL_BACKWARD_COMPAT
   }
 
   //
@@ -890,12 +886,6 @@ TEST(BufferListIterator, advance) {
     bufferlist::iterator i(&bl);
     EXPECT_THROW(i.advance(200u), buffer::end_of_buffer);
   }
-#ifdef BL_BACKWARD_COMPAT
-  {
-    bufferlist::iterator i(&bl);
-    EXPECT_THROW(i.advance(-1), buffer::end_of_buffer);
-  }
-#endif // BL_BACKWARD_COMPAT
   {
     bufferlist::iterator i(&bl);
     EXPECT_EQ('A', *i);
@@ -903,12 +893,6 @@ TEST(BufferListIterator, advance) {
     EXPECT_EQ('B', *i);
     i.advance(3u);
     EXPECT_EQ('E', *i);
-#ifdef BL_BACKWARD_COMPAT
-    i.advance(-3);
-    EXPECT_EQ('B', *i);
-    i.advance(-1);
-    EXPECT_EQ('A', *i);
-#endif // BL_BACKWARD_COMPAT
   }
 }