From: Casey Bodley Date: Tue, 22 Oct 2024 17:48:43 +0000 (-0400) Subject: librados: dont duplicate class names in member definitions X-Git-Tag: v20.0.0~731^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F60453%2Fhead;p=ceph.git librados: dont duplicate class names in member definitions Signed-off-by: Casey Bodley --- diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc index f9bc3b8fd044..2167eeade3c2 100644 --- a/src/librados/librados_cxx.cc +++ b/src/librados/librados_cxx.cc @@ -978,128 +978,127 @@ uint32_t librados::NObjectIterator::get_pg_hash_position() const const librados::NObjectIterator librados::NObjectIterator::__EndObjectIterator(NULL); ///////////////////////////// PoolAsyncCompletion ////////////////////////////// -librados::PoolAsyncCompletion::PoolAsyncCompletion::~PoolAsyncCompletion() +librados::PoolAsyncCompletion::~PoolAsyncCompletion() { auto c = reinterpret_cast(pc); c->release(); } -int librados::PoolAsyncCompletion::PoolAsyncCompletion::set_callback(void *cb_arg, - rados_callback_t cb) +int librados::PoolAsyncCompletion::set_callback(void *cb_arg, rados_callback_t cb) { PoolAsyncCompletionImpl *c = (PoolAsyncCompletionImpl *)pc; return c->set_callback(cb_arg, cb); } -int librados::PoolAsyncCompletion::PoolAsyncCompletion::wait() +int librados::PoolAsyncCompletion::wait() { PoolAsyncCompletionImpl *c = (PoolAsyncCompletionImpl *)pc; return c->wait(); } -bool librados::PoolAsyncCompletion::PoolAsyncCompletion::is_complete() +bool librados::PoolAsyncCompletion::is_complete() { PoolAsyncCompletionImpl *c = (PoolAsyncCompletionImpl *)pc; return c->is_complete(); } -int librados::PoolAsyncCompletion::PoolAsyncCompletion::get_return_value() +int librados::PoolAsyncCompletion::get_return_value() { PoolAsyncCompletionImpl *c = (PoolAsyncCompletionImpl *)pc; return c->get_return_value(); } -void librados::PoolAsyncCompletion::PoolAsyncCompletion::release() +void librados::PoolAsyncCompletion::release() { delete this; } ///////////////////////////// AioCompletion ////////////////////////////// -librados::AioCompletion::AioCompletion::~AioCompletion() +librados::AioCompletion::~AioCompletion() { auto c = reinterpret_cast(pc); c->release(); } -int librados::AioCompletion::AioCompletion::set_complete_callback(void *cb_arg, rados_callback_t cb) +int librados::AioCompletion::set_complete_callback(void *cb_arg, rados_callback_t cb) { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->set_complete_callback(cb_arg, cb); } -int librados::AioCompletion::AioCompletion::set_safe_callback(void *cb_arg, rados_callback_t cb) +int librados::AioCompletion::set_safe_callback(void *cb_arg, rados_callback_t cb) { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->set_safe_callback(cb_arg, cb); } -int librados::AioCompletion::AioCompletion::wait_for_complete() +int librados::AioCompletion::wait_for_complete() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->wait_for_complete(); } -int librados::AioCompletion::AioCompletion::wait_for_safe() +int librados::AioCompletion::wait_for_safe() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->wait_for_complete(); } -bool librados::AioCompletion::AioCompletion::is_complete() +bool librados::AioCompletion::is_complete() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->is_complete(); } -bool librados::AioCompletion::AioCompletion::is_safe() +bool librados::AioCompletion::is_safe() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->is_safe(); } -int librados::AioCompletion::AioCompletion::wait_for_complete_and_cb() +int librados::AioCompletion::wait_for_complete_and_cb() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->wait_for_complete_and_cb(); } -int librados::AioCompletion::AioCompletion::wait_for_safe_and_cb() +int librados::AioCompletion::wait_for_safe_and_cb() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->wait_for_safe_and_cb(); } -bool librados::AioCompletion::AioCompletion::is_complete_and_cb() +bool librados::AioCompletion::is_complete_and_cb() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->is_complete_and_cb(); } -bool librados::AioCompletion::AioCompletion::is_safe_and_cb() +bool librados::AioCompletion::is_safe_and_cb() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->is_safe_and_cb(); } -int librados::AioCompletion::AioCompletion::get_return_value() +int librados::AioCompletion::get_return_value() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->get_return_value(); } -int librados::AioCompletion::AioCompletion::get_version() +int librados::AioCompletion::get_version() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->get_version(); } -uint64_t librados::AioCompletion::AioCompletion::get_version64() +uint64_t librados::AioCompletion::get_version64() { AioCompletionImpl *c = (AioCompletionImpl *)pc; return c->get_version(); } -void librados::AioCompletion::AioCompletion::release() +void librados::AioCompletion::release() { delete this; }