From c2675b5d49fe566a3ec6dc402079b7975fe9f96b Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 23 Aug 2012 08:38:27 +0100 Subject: [PATCH 1/2] Added copy actor and operator = back to TestCaseInfo --- include/internal/catch_test_case_info.h | 2 ++ include/internal/catch_test_case_info.hpp | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/internal/catch_test_case_info.h b/include/internal/catch_test_case_info.h index 5e5a64d8..b7b9bc5d 100644 --- a/include/internal/catch_test_case_info.h +++ b/include/internal/catch_test_case_info.h @@ -27,6 +27,7 @@ namespace Catch { TestCaseInfo( const TestCaseInfo& other, const std::string& name ); + TestCaseInfo( const TestCaseInfo& other ); void invoke() const; const std::string& getName() const; @@ -37,6 +38,7 @@ namespace Catch { void swap( TestCaseInfo& other ); bool operator == ( const TestCaseInfo& other ) const; bool operator < ( const TestCaseInfo& other ) const; + TestCaseInfo& operator = ( const TestCaseInfo& other ); private: Ptr m_test; diff --git a/include/internal/catch_test_case_info.hpp b/include/internal/catch_test_case_info.hpp index ab6ec782..51258a7d 100644 --- a/include/internal/catch_test_case_info.hpp +++ b/include/internal/catch_test_case_info.hpp @@ -36,6 +36,13 @@ namespace Catch { m_lineInfo( other.m_lineInfo ) {} + TestCaseInfo::TestCaseInfo( const TestCaseInfo& other ) + : m_test( other.m_test ), + m_name( other.m_name ), + m_description( other.m_description ), + m_lineInfo( other.m_lineInfo ) + {} + void TestCaseInfo::invoke() const { m_test->invoke(); } @@ -70,6 +77,11 @@ namespace Catch { bool TestCaseInfo::operator < ( const TestCaseInfo& other ) const { return m_name < other.m_name; } + TestCaseInfo& TestCaseInfo::operator = ( const TestCaseInfo& other ) { + TestCaseInfo temp( other ); + swap( temp ); + return *this; + } } #endif // TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED From d2ec84998496a11c0184e945f803e55aa9697914 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 23 Aug 2012 19:48:57 +0100 Subject: [PATCH 2/2] Regenerated single include --- single_include/catch.hpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 6eb6cf3e..ba0259f6 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,5 +1,5 @@ /* - * Generated: 2012-08-16 18:48:36.660439 + * Generated: 2012-08-23 19:48:39.069512 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -1954,6 +1954,7 @@ namespace Catch { const SourceLineInfo& lineInfo ); TestCaseInfo( const TestCaseInfo& other, const std::string& name ); + TestCaseInfo( const TestCaseInfo& other ); void invoke() const; const std::string& getName() const; @@ -1964,6 +1965,7 @@ namespace Catch { void swap( TestCaseInfo& other ); bool operator == ( const TestCaseInfo& other ) const; bool operator < ( const TestCaseInfo& other ) const; + TestCaseInfo& operator = ( const TestCaseInfo& other ); private: Ptr m_test; @@ -4933,6 +4935,13 @@ namespace Catch { m_lineInfo( other.m_lineInfo ) {} + TestCaseInfo::TestCaseInfo( const TestCaseInfo& other ) + : m_test( other.m_test ), + m_name( other.m_name ), + m_description( other.m_description ), + m_lineInfo( other.m_lineInfo ) + {} + void TestCaseInfo::invoke() const { m_test->invoke(); } @@ -4967,6 +4976,11 @@ namespace Catch { bool TestCaseInfo::operator < ( const TestCaseInfo& other ) const { return m_name < other.m_name; } + TestCaseInfo& TestCaseInfo::operator = ( const TestCaseInfo& other ) { + TestCaseInfo temp( other ); + swap( temp ); + return *this; + } } namespace Catch {