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

Made Colour copyable to remove warning

Browse Source
This commit is contained in:
Phil Nash 2014-07-09 07:36:12 +01:00
parent a31f05fe83
commit a469d9bc0f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/internal/catch_console_colour.hpp
View File

@ -54,14 +54,15 @@ namespace Catch {
// Use constructed object for RAII guard // Use constructed object for RAII guard
Colour( Code _colourCode ); Colour( Code _colourCode );
Colour( Colour const& other );
~Colour(); ~Colour();
// Use static method for one-shot changes // Use static method for one-shot changes
static void use( Code _colourCode ); static void use( Code _colourCode );
private: private:
Colour( Colour const& other );
static Detail::IColourImpl* impl(); static Detail::IColourImpl* impl();
bool m_moved;
}; };
inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; } inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; }

5
include/internal/catch_console_colour_impl.hpp
View File

@ -149,8 +149,9 @@ namespace Catch {
} }
} }
Colour::Colour( Code _colourCode ){ use( _colourCode ); } Colour::Colour( Code _colourCode ) : m_moved( false ) { use( _colourCode ); }
Colour::~Colour(){ use( None ); } Colour::Colour( Colour const& _other ) : m_moved( false ) { const_cast<Colour&>( _other ).m_moved = true; }
Colour::~Colour(){ if( !m_moved ) use( None ); }
void Colour::use( Code _colourCode ) { void Colour::use( Code _colourCode ) {
impl()->use( _colourCode ); impl()->use( _colourCode );
} }