diff options
| author | Phil Nash | 2017-07-20 23:50:07 +0100 |
|---|---|---|
| committer | Phil Nash | 2017-07-20 23:50:07 +0100 |
| commit | 46bf7605f41a97535f63abfb2406ec408573b441 (patch) | |
| tree | 1e7dfd3ac6b89e844c40ad97fa2b822d90bd855b /include | |
| parent | cb6963216fd5b178d4220417d18ec4fe9d311cca (diff) | |
| download | catch3-46bf7605f41a97535f63abfb2406ec408573b441.tar.gz | |
Hold exception translators by unique_ptr
- and removed range deleters
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_common.h | 10 | ||||
| -rw-r--r-- | include/internal/catch_exception_translator_registry.cpp | 3 | ||||
| -rw-r--r-- | include/internal/catch_exception_translator_registry.h | 3 | ||||
| -rw-r--r-- | include/internal/catch_interfaces_exception.h | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 6f037c71..bc9a0aba 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -45,16 +45,6 @@ namespace Catch { virtual ~NonCopyable(); }; - template<typename ContainerT> - void deleteAll( ContainerT& container ) { - for( auto p : container ) - delete p; - } - template<typename AssociativeContainerT> - void deleteAllValues( AssociativeContainerT& container ) { - for( auto const& kvp : container ) - delete kvp.second; - } bool startsWith( std::string const& s, std::string const& prefix ); bool startsWith( std::string const& s, char prefix ); diff --git a/include/internal/catch_exception_translator_registry.cpp b/include/internal/catch_exception_translator_registry.cpp index 18e7c0b6..1a857535 100644 --- a/include/internal/catch_exception_translator_registry.cpp +++ b/include/internal/catch_exception_translator_registry.cpp @@ -16,11 +16,10 @@ namespace Catch { ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() { - deleteAll( m_translators ); } void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) { - m_translators.push_back( translator ); + m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) ); } std::string ExceptionTranslatorRegistry::translateActiveException() const { diff --git a/include/internal/catch_exception_translator_registry.h b/include/internal/catch_exception_translator_registry.h index dc5d8159..d3059f48 100644 --- a/include/internal/catch_exception_translator_registry.h +++ b/include/internal/catch_exception_translator_registry.h @@ -11,6 +11,7 @@ #include "catch_interfaces_exception.h" #include <vector> #include <string> +#include <memory> namespace Catch { @@ -22,7 +23,7 @@ namespace Catch { std::string tryTranslators() const; private: - std::vector<const IExceptionTranslator*> m_translators; + std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators; }; } diff --git a/include/internal/catch_interfaces_exception.h b/include/internal/catch_interfaces_exception.h index 6387ba9d..32487ffa 100644 --- a/include/internal/catch_interfaces_exception.h +++ b/include/internal/catch_interfaces_exception.h @@ -18,7 +18,7 @@ namespace Catch { typedef std::string(*exceptionTranslateFunction)(); struct IExceptionTranslator; - typedef std::vector<const IExceptionTranslator*> ExceptionTranslators; + typedef std::vector<std::unique_ptr<IExceptionTranslator const>> ExceptionTranslators; struct IExceptionTranslator { virtual ~IExceptionTranslator(); @@ -40,7 +40,7 @@ namespace Catch { : m_translateFunction( translateFunction ) {} - virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override { + std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override { try { if( it == itEnd ) throw; |