From: Bernd Zeimetz Date: Sun, 5 Jan 2020 19:03:53 +0000 (+0100) Subject: src/rgw/rgw_rest_conn.h: fix build with clang X-Git-Tag: v14.2.8~78^2~17^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32489%2Fhead;p=ceph.git src/rgw/rgw_rest_conn.h: fix build with clang Building with clang requires this little fix for [ 60%] Building CXX object src/rgw/CMakeFiles/rgw_common.dir/services/svc_zone.cc.o cd /<>/obj-arm-linux-gnueabihf/src/rgw && /usr/bin/clang++ -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D__linux__ -I/<>/obj-arm-linux-gnueabihf/src/include -I/<>/src -I/usr/include/nss -I/usr/include/nspr -I/<>/src/dmclock/support/src -isystem /<>/obj-arm-linux-gnueabihf/include -isystem /<>/src/xxHash -isystem /<>/src/rapidjson/include -isystem /<>/src/rgw/services -g -O2 -fdebug-prefix-map=/<>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith -Werror=format-security -fno-strict-aliasing -fsigned-char -Wno-unknown-pragmas -Wno-unused-function -Wno-unused-local-typedef -Wno-varargs -Wno-gnu-designator -Wno-missing-braces -Wno-parentheses -Wno-deprecated-register -g -O2 -fdebug-prefix-map=/<>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -ftemplate-depth-1024 -Wnon-virtual-dtor -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-inconsistent-missing-override -Wno-mismatched-tags -Wno-unused-private-field -Wno-address-of-packed-member -fdiagnostics-color=auto -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -fPIC -DHAVE_CONFIG_H -D__CEPH__ -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -std=c++17 -o CMakeFiles/rgw_common.dir/services/svc_zone.cc.o -c /<>/src/rgw/services/svc_zone.cc In file included from /<>/src/rgw/services/svc_zone.cc:7: /<>/src/rgw/rgw_rest_conn.h:441:28: error: template parameter redefines default argument template ^ /<>/src/rgw/rgw_rest_conn.h:437:32: note: previous default template argument defined here template ^ 1 error generated. This fixes the backport in 16aacb8a7ffeef7a22e4c654dc6a5475d606080d Fixes: 16aacb8a7ffeef7a22e4c654dc6a5475d606080d Fixes: https://tracker.ceph.com/issues/43437 Signed-off-by: Bernd Zeimetz --- diff --git a/src/rgw/rgw_rest_conn.h b/src/rgw/rgw_rest_conn.h index 82047d24e57..9a210292b24 100644 --- a/src/rgw/rgw_rest_conn.h +++ b/src/rgw/rgw_rest_conn.h @@ -438,7 +438,7 @@ public: int wait(T *dest, E *err_result = nullptr); }; -template +template int RGWRESTSendResource::wait(T *dest, E *err_result) { int ret = req.wait();