From 79be070a4d442229d62b168ab87c95b662df1a9c Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Mon, 28 Nov 2016 22:06:56 -0800 Subject: [PATCH] librados: remove new setxattr overload to avoid breaking the C++ ABI Fixes: http://tracker.ceph.com/issues/18058 Signed-off-by: Josh Durgin (cherry picked from commit b8ff781ddcf737882163cf56d7c9b11e815fb699) Conflicts: src/include/rados/librados.hpp (trivial namespace change in removed line) --- src/include/rados/librados.hpp | 1 - src/librados/librados.cc | 8 -------- 2 files changed, 9 deletions(-) diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp index f33a1435cdaf..8450f22a033e 100644 --- a/src/include/rados/librados.hpp +++ b/src/include/rados/librados.hpp @@ -375,7 +375,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 buffer::list&& 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 3db601bb6d01..05dfac509f71 100644 --- a/src/librados/librados.cc +++ b/src/librados/librados.cc @@ -437,14 +437,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 &map) { -- 2.47.3