mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 21:36:11 +01:00
Converted tabs to spaces in some files where they have crept back in
This commit is contained in:
parent
85dff2bce8
commit
e57a56bb28
@ -27,13 +27,13 @@
|
|||||||
|
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
|
|
||||||
class NonCopyable {
|
class NonCopyable {
|
||||||
NonCopyable( const NonCopyable& );
|
NonCopyable( const NonCopyable& );
|
||||||
void operator = ( const NonCopyable& );
|
void operator = ( const NonCopyable& );
|
||||||
protected:
|
protected:
|
||||||
NonCopyable() {}
|
NonCopyable() {}
|
||||||
virtual ~NonCopyable();
|
virtual ~NonCopyable();
|
||||||
};
|
};
|
||||||
|
|
||||||
class SafeBool {
|
class SafeBool {
|
||||||
public:
|
public:
|
||||||
|
@ -97,8 +97,8 @@
|
|||||||
return IsDebuggerPresent() != 0;
|
return IsDebuggerPresent() != 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
inline void BreakIntoDebugger(){}
|
inline void BreakIntoDebugger(){}
|
||||||
inline bool isDebuggerActive() { return false; }
|
inline bool isDebuggerActive() { return false; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CATCH_PLATFORM_WINDOWS
|
#ifdef CATCH_PLATFORM_WINDOWS
|
||||||
|
@ -19,7 +19,7 @@ struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
|
|||||||
// in an ExpressionResultBuilder object
|
// in an ExpressionResultBuilder object
|
||||||
template<typename T>
|
template<typename T>
|
||||||
class ExpressionLhs {
|
class ExpressionLhs {
|
||||||
void operator = ( const ExpressionLhs& );
|
void operator = ( const ExpressionLhs& );
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ExpressionLhs( T lhs ) : m_lhs( lhs ) {}
|
ExpressionLhs( T lhs ) : m_lhs( lhs ) {}
|
||||||
|
@ -69,12 +69,12 @@ class CompositeGenerator {
|
|||||||
public:
|
public:
|
||||||
CompositeGenerator() : m_totalSize( 0 ) {}
|
CompositeGenerator() : m_totalSize( 0 ) {}
|
||||||
|
|
||||||
// *** Move semantics, similar to auto_ptr ***
|
// *** Move semantics, similar to auto_ptr ***
|
||||||
CompositeGenerator( CompositeGenerator& other )
|
CompositeGenerator( CompositeGenerator& other )
|
||||||
: m_fileInfo( other.m_fileInfo ),
|
: m_fileInfo( other.m_fileInfo ),
|
||||||
m_totalSize( 0 )
|
m_totalSize( 0 )
|
||||||
{
|
{
|
||||||
move( other );
|
move( other );
|
||||||
}
|
}
|
||||||
|
|
||||||
CompositeGenerator& setFileInfo( const char* fileInfo ) {
|
CompositeGenerator& setFileInfo( const char* fileInfo ) {
|
||||||
@ -101,7 +101,7 @@ public:
|
|||||||
index += generator->size();
|
index += generator->size();
|
||||||
}
|
}
|
||||||
CATCH_INTERNAL_ERROR( "Indexed past end of generated range" );
|
CATCH_INTERNAL_ERROR( "Indexed past end of generated range" );
|
||||||
return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so
|
return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so
|
||||||
}
|
}
|
||||||
|
|
||||||
void add( const IGenerator<T>* generator ) {
|
void add( const IGenerator<T>* generator ) {
|
||||||
|
@ -32,7 +32,7 @@ namespace Catch {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int overflow( int c ) {
|
int overflow( int c ) {
|
||||||
sync();
|
sync();
|
||||||
|
|
||||||
if( c != EOF ) {
|
if( c != EOF ) {
|
||||||
@ -44,7 +44,7 @@ namespace Catch {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int sync() {
|
int sync() {
|
||||||
if( pbase() != pptr() ) {
|
if( pbase() != pptr() ) {
|
||||||
m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
|
m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
|
||||||
setp( pbase(), epptr() );
|
setp( pbase(), epptr() );
|
||||||
|
Loading…
Reference in New Issue
Block a user