]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw/file: fix build of librgw_file_xattr.cc unit test 52793/head
authorMatt Benjamin <mbenjamin@redhat.com>
Fri, 28 Jul 2023 17:28:32 +0000 (13:28 -0400)
committerMatt Benjamin <mbenjamin@redhat.com>
Sat, 9 Sep 2023 18:22:34 +0000 (14:22 -0400)
commit755fa3e2061db5bb28683487216f084a80cf76fd
treeba2ad623ccb489dcce81efd0913dbe94574a795d
parent794f4d16c6c8bf35729045062d24322d30b5aa14
rgw/file:  fix build of librgw_file_xattr.cc unit test

This resolves a header conflict seen with gcc 12 and clang 17, when
both rgw_file.h and rados/rgw_file.h were included (e.g., in
librgw_file_xattr.cc).

The operative change is the explicit path to rgw_file...h, but
I've renamed it as well to avoid confusion.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/rgw/rgw_file.cc
src/rgw/rgw_file.h [deleted file]
src/rgw/rgw_file_int.h [new file with mode: 0644]
src/rgw/rgw_lib_frontend.h
src/rgw/rgw_os_lib.cc
src/test/librgw_file_marker.cc
src/test/librgw_file_nfsns.cc
src/test/librgw_file_xattr.cc