From: <sv...@op...> - 2024-09-23 18:46:25
|
Author: manx Date: Mon Sep 23 20:46:13 2024 New Revision: 21708 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21708 Log: [Ref] openmpt123: Older clang has stupid opinions about coding style. Use override instead of final, it does not really matter here. Modified: trunk/OpenMPT/openmpt123/openmpt123.hpp Modified: trunk/OpenMPT/openmpt123/openmpt123.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.hpp Mon Sep 23 20:41:06 2024 (r21707) +++ trunk/OpenMPT/openmpt123/openmpt123.hpp Mon Sep 23 20:46:13 2024 (r21708) @@ -194,12 +194,12 @@ class textout_dummy : public textout { public: textout_dummy() = default; - ~textout_dummy() final = default; + ~textout_dummy() override = default; public: - void writeout() final { + void writeout() override { static_cast<void>( pop() ); } - void cursor_up( std::size_t lines ) final { + void cursor_up( std::size_t lines ) override { static_cast<void>( lines ); } }; @@ -241,9 +241,9 @@ #endif return; } - ~textout_ostream() final = default; + ~textout_ostream() override = default; public: - void write( const mpt::ustring & text ) final { + void write( const mpt::ustring & text ) override { if ( text.length() > 0 ) { #if MPT_OS_DJGPP s << mpt::transcode<std::string>( codepage, text ); @@ -255,7 +255,7 @@ s.flush(); } } - void cursor_up( std::size_t lines ) final { + void cursor_up( std::size_t lines ) override { s.flush(); for ( std::size_t line = 0; line < lines; ++line ) { s << std::string("\x1b[1A"); @@ -274,15 +274,15 @@ { return; } - ~textout_wostream() final = default; + ~textout_wostream() override = default; public: - void write( const mpt::ustring & text ) final { + void write( const mpt::ustring & text ) override { if ( text.length() > 0 ) { s << mpt::transcode<std::wstring>( text ); s.flush(); } } - void cursor_up( std::size_t lines ) final { + void cursor_up( std::size_t lines ) override { s.flush(); for ( std::size_t line = 0; line < lines; ++line ) { s << std::wstring(L"\x1b[1A"); @@ -315,9 +315,9 @@ { return; } - ~textout_ostream_console() final = default; + ~textout_ostream_console() override = default; public: - void write( const mpt::ustring & text ) final { + void write( const mpt::ustring & text ) override { if ( text.length() > 0 ) { if ( console ) { DWORD chars_written = 0; @@ -338,7 +338,7 @@ } } } - void cursor_up( std::size_t lines ) final { + void cursor_up( std::size_t lines ) override { if ( console ) { s.flush(); CONSOLE_SCREEN_BUFFER_INFO csbi; @@ -378,12 +378,12 @@ #endif public: textout_wrapper() = default; - ~textout_wrapper() final = default; + ~textout_wrapper() override = default; public: - void writeout() final { + void writeout() override { out.write( pop() ); } - void cursor_up(std::size_t lines) final { + void cursor_up(std::size_t lines) override { out.cursor_up( lines ); } }; |