3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-16 18:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code review changes to fix missing default ctor initialisation

Browse Source
This commit is contained in:
Craig Henderson 2013-10-12 15:23:29 +01:00
parent 48c9e5b1df
commit da25a3d1b2
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.0 build 11 (master branch)* *v1.0 build 12 (master branch)*
# New release with significant changes # New release with significant changes

2
include/internal/catch_assertionresult.h
View File

@ -15,7 +15,7 @@ namespace Catch {
struct AssertionInfo struct AssertionInfo
{ {
AssertionInfo() {} AssertionInfo() : macroName(nullptr), capturedExpression(nullptr) {}
AssertionInfo( char const * _macroName, AssertionInfo( char const * _macroName,
SourceLineInfo const& _lineInfo, SourceLineInfo const& _lineInfo,
char const * _capturedExpression, char const * _capturedExpression,

4
include/internal/catch_assertionresult.hpp
View File

@ -47,7 +47,7 @@ namespace Catch {
} }
bool AssertionResult::hasExpression() const { bool AssertionResult::hasExpression() const {
return m_info.capturedExpression != 0 && *m_info.capturedExpression != 0; return m_info.capturedExpression && *m_info.capturedExpression;
} }
bool AssertionResult::hasMessage() const { bool AssertionResult::hasMessage() const {
@ -61,7 +61,7 @@ namespace Catch {
return m_info.capturedExpression; return m_info.capturedExpression;
} }
std::string AssertionResult::getExpressionInMacro() const { std::string AssertionResult::getExpressionInMacro() const {
if( m_info.macroName == 0 || *m_info.macroName == 0) if( m_info.macroName == nullptr || *m_info.macroName == 0)
return m_info.capturedExpression; return m_info.capturedExpression;
else else
return std::string(m_info.macroName) + "( " + m_info.capturedExpression + " )"; return std::string(m_info.macroName) + "( " + m_info.capturedExpression + " )";

4
include/internal/catch_common.h
View File

@ -104,7 +104,7 @@ namespace Catch {
struct SourceLineInfo { struct SourceLineInfo {
SourceLineInfo() : line( 0 ){} SourceLineInfo() : file( nullptr ), line( 0 ){}
SourceLineInfo( char const * _file, std::size_t _line ) SourceLineInfo( char const * _file, std::size_t _line )
: file( _file ), : file( _file ),
line( _line ) line( _line )
@ -114,7 +114,7 @@ namespace Catch {
line( other.line ) line( other.line )
{} {}
bool empty() const { bool empty() const {
return file == 0 || *file == 0; return file == nullptr || *file == 0;
} }
bool operator == ( SourceLineInfo const& other ) const { bool operator == ( SourceLineInfo const& other ) const {
return line == other.line && ((empty() && other.empty()) || strcmp(file, other.file) == 0); return line == other.line && ((empty() && other.empty()) || strcmp(file, other.file) == 0);

2
include/internal/catch_version.hpp
View File

@ -13,7 +13,7 @@
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 11, "master" ); Version libraryVersion( 1, 0, 12, "master" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

16
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 11 (master branch) * CATCH v1.0 build 12 (master branch)
* Generated: 2013-10-12 10:11:15.393000 * Generated: 2013-10-12 15:20:33.039000
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -196,7 +196,7 @@ namespace Catch {
struct SourceLineInfo { struct SourceLineInfo {
SourceLineInfo() : line( 0 ){} SourceLineInfo() : file( nullptr ), line( 0 ){}
SourceLineInfo( char const * _file, std::size_t _line ) SourceLineInfo( char const * _file, std::size_t _line )
: file( _file ), : file( _file ),
line( _line ) line( _line )
@ -206,7 +206,7 @@ namespace Catch {
line( other.line ) line( other.line )
{} {}
bool empty() const { bool empty() const {
return file == 0 || *file == 0; return file == nullptr || *file == 0;
} }
bool operator == ( SourceLineInfo const& other ) const { bool operator == ( SourceLineInfo const& other ) const {
return line == other.line && ((empty() && other.empty()) || strcmp(file, other.file) == 0); return line == other.line && ((empty() && other.empty()) || strcmp(file, other.file) == 0);
@ -935,7 +935,7 @@ namespace Catch {
struct AssertionInfo struct AssertionInfo
{ {
AssertionInfo() {} AssertionInfo() : macroName(nullptr), capturedExpression(nullptr) {}
AssertionInfo( char const * _macroName, AssertionInfo( char const * _macroName,
SourceLineInfo const& _lineInfo, SourceLineInfo const& _lineInfo,
char const * _capturedExpression, char const * _capturedExpression,
@ -6122,7 +6122,7 @@ namespace Catch {
} }
bool AssertionResult::hasExpression() const { bool AssertionResult::hasExpression() const {
return m_info.capturedExpression != 0 && *m_info.capturedExpression != 0; return m_info.capturedExpression && *m_info.capturedExpression;
} }
bool AssertionResult::hasMessage() const { bool AssertionResult::hasMessage() const {
@ -6136,7 +6136,7 @@ namespace Catch {
return m_info.capturedExpression; return m_info.capturedExpression;
} }
std::string AssertionResult::getExpressionInMacro() const { std::string AssertionResult::getExpressionInMacro() const {
if( m_info.macroName == 0 || *m_info.macroName == 0) if( m_info.macroName == nullptr || *m_info.macroName == 0)
return m_info.capturedExpression; return m_info.capturedExpression;
else else
return std::string(m_info.macroName) + "( " + m_info.capturedExpression + " )"; return std::string(m_info.macroName) + "( " + m_info.capturedExpression + " )";
@ -6371,7 +6371,7 @@ namespace Catch {
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 11, "master" ); Version libraryVersion( 1, 0, 12, "master" );
} }
// #included from: catch_text.hpp // #included from: catch_text.hpp