Fixed an issue on some compilers with implicit conversion from nullptr to Ptr

- also cleaned up some warnings to do with CATCH_NULL
This commit is contained in:
Phil Nash 2015-07-03 18:27:36 +01:00
parent 62e517f833
commit d6f1446e4e
6 changed files with 13 additions and 5 deletions

View file

@ -78,7 +78,7 @@ namespace Catch {
virtual ~RunContext() {
m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) );
m_context.setRunner( m_prevRunner );
m_context.setConfig( CATCH_NULL );
m_context.setConfig( Ptr<IConfig const>() );
m_context.setResultCapture( m_prevResultCapture );
m_context.setConfig( m_prevConfig );
}