diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2024-12-26 19:41:53 +0000 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2025-01-05 22:16:08 +0000 |
| commit | f73593a4034d9eec0ec4466b8e173d4a4daece1f (patch) | |
| tree | 9cab47b9426e3e9fff80682b86f8449e3d9c9b53 /test/interactive-helper | |
| parent | 427f95cedadb5323d35e5174d4592cbdd9c602f4 (diff) | |
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.
Diffstat (limited to 'test/interactive-helper')
| -rw-r--r-- | test/interactive-helper/teestream.h | 8 | ||||
| -rw-r--r-- | test/interactive-helper/testdeb.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/interactive-helper/teestream.h b/test/interactive-helper/teestream.h index 058717ac3..511c6da60 100644 --- a/test/interactive-helper/teestream.h +++ b/test/interactive-helper/teestream.h @@ -19,13 +19,13 @@ public: std::basic_streambuf<CharT, Traits> * const sb2) : s1(sb1), s2(sb2) {} protected: - virtual std::streamsize xsputn(const CharT* s, std::streamsize c) APT_OVERRIDE + virtual std::streamsize xsputn(const CharT* s, std::streamsize c) override { return s2->sputn(s, s1->sputn(s, c)); } // overflow is the fallback of sputc which is non-virtual typedef typename Traits::int_type int_type; - virtual int_type overflow(int_type ch = Traits::eof()) APT_OVERRIDE + int_type overflow(int_type ch = Traits::eof()) override { auto const eof = Traits::eof(); if (Traits::eq_int_type(ch, Traits::eof()) == true) @@ -35,12 +35,12 @@ protected: auto const r2 = s2->sputc(Traits::to_char_type(ch)); return Traits::eq_int_type(r1, eof) ? r1: r2; } - virtual void imbue(const std::locale& loc) APT_OVERRIDE + void imbue(const std::locale& loc) override { s1->pubimbue(loc); s2->pubimbue(loc); } - virtual int sync() APT_OVERRIDE + int sync() override { auto const r1 = s1->pubsync(); auto const r2 = s2->pubsync(); diff --git a/test/interactive-helper/testdeb.cc b/test/interactive-helper/testdeb.cc index 0bb24a52a..20376181b 100644 --- a/test/interactive-helper/testdeb.cc +++ b/test/interactive-helper/testdeb.cc @@ -13,7 +13,7 @@ class NullStream : public pkgDirStream { public: - virtual bool DoItem(Item &/*Itm*/, int &/*Fd*/) APT_OVERRIDE {return true;}; + bool DoItem(Item &/*Itm*/, int &/*Fd*/) override {return true;}; }; static bool Test(const char *File) |