3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-03 21:49:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename useColourOnPlatform => useImplementationForStream

Browse Source
This commit is contained in:
Martin Hořeňovský
2022-05-03 19:04:29 +02:00
parent 91ea25e51a
commit 40c8909a49
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/catch2/internal/catch_console_colour.cpp
View File

@@ -114,7 +114,7 @@ namespace {
originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY ); originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
} }
static bool useColourOnPlatform(IStream const& stream) { static bool useImplementationForStream(IStream const& stream) {
// Win32 text colour APIs can only be used on console streams // Win32 text colour APIs can only be used on console streams
// We cannot check that the output hasn't been redirected, // We cannot check that the output hasn't been redirected,
// so we just check that the original stream is console stream. // so we just check that the original stream is console stream.
@@ -173,7 +173,7 @@ namespace {
public: public:
ANSIColourImpl( IStream* stream ): ColourImpl( stream ) {} ANSIColourImpl( IStream* stream ): ColourImpl( stream ) {}
static bool useColourOnPlatform(IStream const& stream) { static bool useImplementationForStream(IStream const& stream) {
// This is kinda messy due to trying to support a bunch of // This is kinda messy due to trying to support a bunch of
// different platforms at once. // different platforms at once.
// The basic idea is that if we are asked to do autodetection (as // The basic idea is that if we are asked to do autodetection (as
@@ -247,13 +247,13 @@ namespace Catch {
// todo: check win32 eligibility under ifdef, otherwise ansi // todo: check win32 eligibility under ifdef, otherwise ansi
if ( implSelection == ColourMode::PlatformDefault) { if ( implSelection == ColourMode::PlatformDefault) {
#if defined (CATCH_CONFIG_COLOUR_WIN32) #if defined (CATCH_CONFIG_COLOUR_WIN32)
if ( Win32ColourImpl::useColourOnPlatform( *stream ) ) { if ( Win32ColourImpl::useImplementationForStream( *stream ) ) {
return Detail::make_unique<Win32ColourImpl>( stream ); return Detail::make_unique<Win32ColourImpl>( stream );
} else { } else {
return Detail::make_unique<NoColourImpl>( stream ); return Detail::make_unique<NoColourImpl>( stream );
} }
#endif #endif
if ( ANSIColourImpl::useColourOnPlatform( *stream ) ) { if ( ANSIColourImpl::useImplementationForStream( *stream ) ) {
return Detail::make_unique<ANSIColourImpl>( stream ); return Detail::make_unique<ANSIColourImpl>( stream );
} }
return Detail::make_unique<NoColourImpl>( stream ); return Detail::make_unique<NoColourImpl>( stream );