mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-25 23:06:10 +01:00
Tidy up after merge mess
This commit is contained in:
parent
fa9f970890
commit
9a703f73d4
@ -263,14 +263,7 @@ public:
|
|||||||
{
|
{
|
||||||
instance().currentResult.setMessage( msg );
|
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 )
|
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 );
|
return instance().m_listener->sectionStarted( name, description, successes, failures );
|
||||||
|
@ -141,6 +141,8 @@ namespace Catch
|
|||||||
m_reporter->StartSection( name, description );
|
m_reporter->StartSection( name, description );
|
||||||
successes = m_successes;
|
successes = m_successes;
|
||||||
failures = m_failures;
|
failures = m_failures;
|
||||||
|
|
||||||
|
// !TBD look up whether we should execute this section or not
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user