The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ca0d182dfeb68405cfba002622787adb10cfe7a0
commit ca0d182dfeb68405cfba002622787adb10cfe7a0 Author: John Baldwin <j...@freebsd.org> AuthorDate: 2025-08-07 17:10:55 +0000 Commit: John Baldwin <j...@freebsd.org> CommitDate: 2025-08-07 18:26:46 +0000 libutil++: Appease GCC -Wshadow warnings in constructors Fixes: 937e92b5f7cc ("libutil++: Add freebsd::fd_up class to manage file descriptors") Fixes: 7be913e00d79 ("libutil++: Add freebsd::pidfile wrapper class around struct pidfh") Sponsored by: Chelsio Communications --- lib/libutil++/libutil++.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libutil++/libutil++.hh b/lib/libutil++/libutil++.hh index ecf737f2fcb0..60e6b3fc5fde 100644 --- a/lib/libutil++/libutil++.hh +++ b/lib/libutil++/libutil++.hh @@ -70,7 +70,7 @@ namespace freebsd { class fd_up { public: fd_up() : fd(-1) {} - fd_up(int fd) : fd(fd) {} + fd_up(int _fd) : fd(_fd) {} fd_up(fd_up &&other) : fd(other.release()) {} fd_up(fd_up const &) = delete; @@ -159,7 +159,7 @@ namespace freebsd { class pidfile { public: pidfile() = default; - pidfile(struct pidfh *pfh) : pfh(pfh) {} + pidfile(struct pidfh *_pfh) : pfh(_pfh) {} pidfile(pidfile &&other) : pfh(other.release()) {} pidfile(pidfile const &) = delete;