diff options
| author | Phil Nash | 2015-07-03 18:27:36 +0100 |
|---|---|---|
| committer | Phil Nash | 2015-07-03 18:27:36 +0100 |
| commit | d6f1446e4e5dc36af5e760d41f5edd7f361abda2 (patch) | |
| tree | 2f38a9f04608e931e69795dcf8ec61a60680a52b /include | |
| parent | 62e517f83325ece83f65b14a01283b5e5c001160 (diff) | |
| download | catch3-d6f1446e4e5dc36af5e760d41f5edd7f361abda2.tar.gz | |
Fixed an issue on some compilers with implicit conversion from nullptr to Ptr
- also cleaned up some warnings to do with CATCH_NULL
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_runner_impl.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp index 073f78d3..39b9888b 100644 --- a/include/internal/catch_runner_impl.hpp +++ b/include/internal/catch_runner_impl.hpp @@ -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 ); } |