From 9a703f73d4e2f887f95a6d92e49f0e401135f2e3 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Mon, 29 Nov 2010 22:52:27 +0000 Subject: [PATCH] Tidy up after merge mess --- internal/catch_capture.hpp | 9 +-------- internal/catch_runner_impl.hpp | 2 ++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/catch_capture.hpp b/internal/catch_capture.hpp index ee8b00ce..81373843 100644 --- a/internal/catch_capture.hpp +++ b/internal/catch_capture.hpp @@ -263,14 +263,7 @@ public: { instance().currentResult.setMessage( msg ); } - static void acceptSectionStart( const std::string& name, const std::string& description ) - { - } - - static void acceptSectionEnd( const std::string& name ) - { - } - + static bool acceptSectionStart( const std::string& name, const std::string& description, std::size_t& successes, std::size_t& failures ) { return instance().m_listener->sectionStarted( name, description, successes, failures ); diff --git a/internal/catch_runner_impl.hpp b/internal/catch_runner_impl.hpp index 9b5e7c67..596bfb78 100644 --- a/internal/catch_runner_impl.hpp +++ b/internal/catch_runner_impl.hpp @@ -141,6 +141,8 @@ namespace Catch m_reporter->StartSection( name, description ); successes = m_successes; failures = m_failures; + + // !TBD look up whether we should execute this section or not return true; }