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

Removed some trailing whitespace

Browse Source
This commit is contained in:
Phil Nash 2015-12-04 10:20:33 +00:00
parent fdc42d0af4
commit 722315a1f5
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_interfaces_exception.h
View File

@ -19,7 +19,7 @@ namespace Catch {
struct IExceptionTranslator; struct IExceptionTranslator;
typedef std::vector<const IExceptionTranslator*> ExceptionTranslators; typedef std::vector<const IExceptionTranslator*> ExceptionTranslators;
struct IExceptionTranslator { struct IExceptionTranslator {
virtual ~IExceptionTranslator(); virtual ~IExceptionTranslator();
virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0; virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;

10
include/internal/catch_matchers.hpp
View File

@ -17,7 +17,7 @@ namespace Matchers {
template<typename ExpressionT> class AnyOf; template<typename ExpressionT> class AnyOf;
template<typename ExpressionT> class Not; template<typename ExpressionT> class Not;
} }
template<typename ExpressionT> template<typename ExpressionT>
struct Matcher : SharedImpl<IShared> struct Matcher : SharedImpl<IShared>
{ {
@ -27,7 +27,7 @@ namespace Matchers {
virtual Ptr<Matcher> clone() const = 0; virtual Ptr<Matcher> clone() const = 0;
virtual bool match( ExpressionT const& expr ) const = 0; virtual bool match( ExpressionT const& expr ) const = 0;
virtual std::string toString() const = 0; virtual std::string toString() const = 0;
Generic::AllOf<ExpressionT> operator && ( Matcher<ExpressionT> const& other ) const; Generic::AllOf<ExpressionT> operator && ( Matcher<ExpressionT> const& other ) const;
Generic::AnyOf<ExpressionT> operator || ( Matcher<ExpressionT> const& other ) const; Generic::AnyOf<ExpressionT> operator || ( Matcher<ExpressionT> const& other ) const;
Generic::Not<ExpressionT> operator ! () const; Generic::Not<ExpressionT> operator ! () const;
@ -134,13 +134,13 @@ namespace Matchers {
anyOfExpr.add( other ); anyOfExpr.add( other );
return anyOfExpr; return anyOfExpr;
} }
private: private:
std::vector<Ptr<Matcher<ExpressionT> > > m_matchers; std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
}; };
} // namespace Generic } // namespace Generic
template<typename ExpressionT> template<typename ExpressionT>
Generic::AllOf<ExpressionT> Matcher<ExpressionT>::operator && ( Matcher<ExpressionT> const& other ) const { Generic::AllOf<ExpressionT> Matcher<ExpressionT>::operator && ( Matcher<ExpressionT> const& other ) const {
Generic::AllOf<ExpressionT> allOfExpr; Generic::AllOf<ExpressionT> allOfExpr;
@ -161,7 +161,7 @@ namespace Matchers {
Generic::Not<ExpressionT> Matcher<ExpressionT>::operator ! () const { Generic::Not<ExpressionT> Matcher<ExpressionT>::operator ! () const {
return Generic::Not<ExpressionT>( *this ); return Generic::Not<ExpressionT>( *this );
} }
namespace StdString { namespace StdString {

4
include/internal/catch_test_case_registry_impl.hpp
View File

@ -157,7 +157,7 @@ namespace Catch {
char const* classOrQualifiedMethodName, char const* classOrQualifiedMethodName,
NameAndDesc const& nameAndDesc, NameAndDesc const& nameAndDesc,
SourceLineInfo const& lineInfo ) { SourceLineInfo const& lineInfo ) {
getMutableRegistryHub().registerTest getMutableRegistryHub().registerTest
( makeTestCase ( makeTestCase
( testCase, ( testCase,
@ -172,7 +172,7 @@ namespace Catch {
NameAndDesc const& nameAndDesc ) { NameAndDesc const& nameAndDesc ) {
registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo ); registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo );
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
AutoReg::AutoReg AutoReg::AutoReg

4
projects/SelfTest/ExceptionTests.cpp
View File

@ -113,12 +113,12 @@ public:
: m_msg( msg ) : m_msg( msg )
{} {}
~CustomStdException() CATCH_NOEXCEPT {} ~CustomStdException() CATCH_NOEXCEPT {}
std::string getMessage() const std::string getMessage() const
{ {
return m_msg; return m_msg;
} }
private: private:
std::string m_msg; std::string m_msg;
}; };