From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 29 Nov 2016 06:06:56 +0000 (-0800)
Subject: librados: remove new setxattr overload to avoid breaking the C++ ABI
X-Git-Tag: v11.1.0~100^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b8ff781ddcf737882163cf56d7c9b11e815fb699;p=ceph-ci.git

librados: remove new setxattr overload to avoid breaking the C++ ABI

Fixes: http://tracker.ceph.com/issues/18058
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 2fa99709961..e474eca879f 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -395,7 +395,6 @@ namespace librados
     void zero(uint64_t off, uint64_t len);
     void rmxattr(const char *name);
     void setxattr(const char *name, const bufferlist& bl);
-    void setxattr(const char *name, const bufferlist&& bl);
     void tmap_update(const bufferlist& cmdbl);
     void tmap_put(const bufferlist& bl);
     void clone_range(uint64_t dst_off,
diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index 55f0a5abc48..d331c193a45 100644
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -445,14 +445,6 @@ void librados::ObjectWriteOperation::setxattr(const char *name, const bufferlist
   o->setxattr(name, v);
 }
 
-void librados::ObjectWriteOperation::setxattr(const char *name,
-					      const buffer::list&& v)
-{
-  ::ObjectOperation *o = &impl->o;
-  o->setxattr(name, std::move(v));
-}
-
-
 void librados::ObjectWriteOperation::omap_set(
   const map<string, bufferlist> &map)
 {