Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-06-19 20:57:06 +0200
committerMartin Hořeňovský2021-06-19 20:57:06 +0200
commita7533707ff3e1e4ed7a60e0ebe1984ad4b08e3f9 (patch)
treee65f86b16efaa607bc5b217537ed4b61d0239a8d /src
parent28a33497be6c6d18d9fc6e2e4cfe6ce7b50680be (diff)
downloadcatch3-a7533707ff3e1e4ed7a60e0ebe1984ad4b08e3f9.tar.gz
Use unique_ptr for passing around exception translators
Diffstat (limited to 'src')
-rw-r--r--src/catch2/catch_registry_hub.cpp4
-rw-r--r--src/catch2/catch_translate_exception.hpp7
-rw-r--r--src/catch2/interfaces/catch_interfaces_registry_hub.hpp2
-rw-r--r--src/catch2/internal/catch_exception_translator_registry.cpp4
-rw-r--r--src/catch2/internal/catch_exception_translator_registry.hpp4
5 files changed, 13 insertions, 8 deletions
diff --git a/src/catch2/catch_registry_hub.cpp b/src/catch2/catch_registry_hub.cpp
index e3a222df..c183600a 100644
--- a/src/catch2/catch_registry_hub.cpp
+++ b/src/catch2/catch_registry_hub.cpp
@@ -56,8 +56,8 @@ namespace Catch {
void registerTest( Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker ) override {
m_testCaseRegistry.registerTest( std::move(testInfo), std::move(invoker) );
}
- void registerTranslator( const IExceptionTranslator* translator ) override {
- m_exceptionTranslatorRegistry.registerTranslator( translator );
+ void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) override {
+ m_exceptionTranslatorRegistry.registerTranslator( std::move(translator) );
}
void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
m_tagAliasRegistry.add( alias, tag, lineInfo );
diff --git a/src/catch2/catch_translate_exception.hpp b/src/catch2/catch_translate_exception.hpp
index 1bb8bb92..6053a10b 100644
--- a/src/catch2/catch_translate_exception.hpp
+++ b/src/catch2/catch_translate_exception.hpp
@@ -48,8 +48,11 @@ namespace Catch {
public:
template<typename T>
ExceptionTranslatorRegistrar( std::string(*translateFunction)( T const& ) ) {
- getMutableRegistryHub().registerTranslator
- ( new ExceptionTranslator<T>( translateFunction ) );
+ getMutableRegistryHub().registerTranslator(
+ Detail::unique_ptr<IExceptionTranslator>(
+ new ExceptionTranslator<T>( translateFunction )
+ )
+ );
}
};
diff --git a/src/catch2/interfaces/catch_interfaces_registry_hub.hpp b/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
index 71f2faa2..aeefeedb 100644
--- a/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
+++ b/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
@@ -47,7 +47,7 @@ namespace Catch {
virtual void registerReporter( std::string const& name, IReporterFactoryPtr factory ) = 0;
virtual void registerListener( IReporterFactoryPtr factory ) = 0;
virtual void registerTest(Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker) = 0;
- virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+ virtual void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) = 0;
virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
virtual void registerStartupException() noexcept = 0;
virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
diff --git a/src/catch2/internal/catch_exception_translator_registry.cpp b/src/catch2/internal/catch_exception_translator_registry.cpp
index 08483889..52831fc5 100644
--- a/src/catch2/internal/catch_exception_translator_registry.cpp
+++ b/src/catch2/internal/catch_exception_translator_registry.cpp
@@ -15,8 +15,8 @@ namespace Catch {
ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
}
- void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
- m_translators.push_back( Detail::unique_ptr<const IExceptionTranslator>( translator ) );
+ void ExceptionTranslatorRegistry::registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) {
+ m_translators.push_back( std::move( translator ) );
}
#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
diff --git a/src/catch2/internal/catch_exception_translator_registry.hpp b/src/catch2/internal/catch_exception_translator_registry.hpp
index 59983a5a..465796d3 100644
--- a/src/catch2/internal/catch_exception_translator_registry.hpp
+++ b/src/catch2/internal/catch_exception_translator_registry.hpp
@@ -9,6 +9,8 @@
#define CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
#include <catch2/interfaces/catch_interfaces_exception.hpp>
+#include <catch2/internal/catch_unique_ptr.hpp>
+
#include <vector>
#include <string>
@@ -17,7 +19,7 @@ namespace Catch {
class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
public:
~ExceptionTranslatorRegistry() override;
- void registerTranslator( const IExceptionTranslator* translator );
+ void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator );
std::string translateActiveException() const override;
std::string tryTranslators() const;