From f73593a4034d9eec0ec4466b8e173d4a4daece1f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Dec 2024 19:41:53 +0000 Subject: Drop usage of macro APT_OVERRIDE for simple override We were rather inconsistent in using it and as our public headers contain deduction guides (a c++17 feature) it seems silly to try to hide a c++11 feature in a macro, so lets stop this charade and drop the macro and while we are changing all these lines lets apply [[nodiscard]] (another c++17 feature) and other suggestions from clang-tidy and formatting for a little more consistency. --- methods/connect.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'methods/connect.cc') diff --git a/methods/connect.cc b/methods/connect.cc index b00e73eb7..ff2e39260 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -89,10 +89,10 @@ static bool ConnectionAllowed(char const * const Service, std::string const &Hos struct FdFd final : public MethodFd { int fd = -1; - int Fd() APT_OVERRIDE { return fd; } - ssize_t Read(void *buf, size_t count) APT_OVERRIDE { return ::read(fd, buf, count); } - ssize_t Write(void *buf, size_t count) APT_OVERRIDE { return ::write(fd, buf, count); } - int Close() APT_OVERRIDE + int Fd() override { return fd; } + ssize_t Read(void *buf, size_t count) override { return ::read(fd, buf, count); } + ssize_t Write(void *buf, size_t count) override { return ::write(fd, buf, count); } + int Close() override { int result = 0; if (fd != -1) -- cgit v1.2.3-70-g09d2