From b8ff781ddcf737882163cf56d7c9b11e815fb699 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 --- 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 2fa9970996157..e474eca879fdc 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 55f0a5abc48a8..d331c193a452e 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 &map) { -- 2.39.5