catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Build 20
- Commit
eb760f689b777ef0e14177a4232928af397227c2- Author
- Phil Nash ·
- Parents
f6d2fef26b68
Changes
README.md | 2 +- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 22 +++++++++++++++------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4b321812..59325a4e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@  -*v1.0 build 19 (master branch)* +*v1.0 build 20 (master branch)* Build status (on Travis CI) [](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 62ce4115..ab86363b 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 19, "master" ); + Version libraryVersion( 1, 0, 20, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index bc2644b4..eb20e5de 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 19 (master branch) - * Generated: 2013-12-14 23:16:21.805565 + * CATCH v1.0 build 20 (master branch) + * Generated: 2013-12-18 08:38:15.171445 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -6166,7 +6166,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 19, "master" ); + Version libraryVersion( 1, 0, 20, "master" ); } // #included from: catch_text.hpp @@ -6739,9 +6739,15 @@ namespace Catch { std::string stdOut; std::string stdErr; }; - friend bool operator == ( Ptr<SectionNode> const& node, SectionInfo const& other ) { - return node->stats.sectionInfo.lineInfo == other.lineInfo; - } + + struct BySectionInfo { + BySectionInfo( SectionInfo const& other ) : m_other( other ) {} + bool operator() ( Ptr<SectionNode> const& node ) const { + return node->stats.sectionInfo.lineInfo == m_other.lineInfo; + } + private: + SectionInfo const& m_other; + }; typedef Node<TestCaseStats, SectionNode> TestCaseNode; typedef Node<TestGroupStats, TestCaseNode> TestGroupNode; @@ -6769,7 +6775,9 @@ namespace Catch { else { SectionNode& parentNode = *m_sectionStack.back(); SectionNode::ChildSections::const_iterator it = - std::find( parentNode.childSections.begin(), parentNode.childSections.end(), sectionInfo ); + std::find_if( parentNode.childSections.begin(), + parentNode.childSections.end(), + BySectionInfo( sectionInfo ) ); if( it == parentNode.childSections.end() ) { node = new SectionNode( incompleteStats ); parentNode.childSections.push_back( node );