From: Kefu Chai Date: Mon, 10 Dec 2018 14:58:20 +0000 (+0800) Subject: include/rados: s/requires/req/ X-Git-Tag: v14.1.0~607^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bfdd0f6f73e922e46ca67f125063d6add715cbca;p=ceph.git include/rados: s/requires/req/ requires is a keyword in C++20. which is close =) Signed-off-by: Kefu Chai --- diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h index 8ba19d6fcceb..ca3cdb34e07b 100644 --- a/src/include/rados/librados.h +++ b/src/include/rados/librados.h @@ -978,11 +978,11 @@ CEPH_RADOS_API int rados_ioctx_pool_requires_alignment(rados_ioctx_t io) * Test whether the specified pool requires alignment or not. * * @param io pool to query - * @param requires 1 if alignment is supported, 0 if not. + * @param req 1 if alignment is supported, 0 if not. * @returns 0 on success, negative error code on failure */ CEPH_RADOS_API int rados_ioctx_pool_requires_alignment2(rados_ioctx_t io, - int *requires); + int *req); /* deprecated, use rados_ioctx_pool_required_alignment2 instead */ CEPH_RADOS_API uint64_t rados_ioctx_pool_required_alignment(rados_ioctx_t io) diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp index f38877d7616b..c4a87aa2697e 100644 --- a/src/include/rados/librados.hpp +++ b/src/include/rados/librados.hpp @@ -737,7 +737,7 @@ namespace librados std::string get_pool_name(); bool pool_requires_alignment(); - int pool_requires_alignment2(bool * requires); + int pool_requires_alignment2(bool * req); uint64_t pool_required_alignment(); int pool_required_alignment2(uint64_t * alignment);