catchorg/Catch2
1
0
Fork 1
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-03 00:22:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1336 from ax3l/topic-overrideVirtualRedundant

Browse Source 
Refactor: override implies virtual
This commit is contained in:
Martin Hořeňovský
2019-04-18 14:10:24 +02:00
committed by GitHub
parent c7653811a6 5347ff9e5f
commit c3c82f539c
9 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_console_colour.cpp
View File

@@ -69,7 +69,7 @@ namespace {
originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
}
virtual void use( Colour::Code _colourCode ) override {
void use( Colour::Code _colourCode ) override {
switch( _colourCode ) {
case Colour::None: return setTextAttribute( originalForegroundAttributes );
case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
@@ -132,7 +132,7 @@ namespace {
// https://github.com/philsquared/Catch/pull/131
class PosixColourImpl : public IColourImpl {
public:
virtual void use( Colour::Code _colourCode ) override {
void use( Colour::Code _colourCode ) override {
switch( _colourCode ) {
case Colour::None:
case Colour::White: return setColour( "[0m" );