3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move std::exception_ptr out of interfaces

Browse Source
This commit is contained in:
Martin Hořeňovský 2017-07-27 12:24:52 +02:00
parent 307eeefa8f
commit 446bad752f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_interfaces_registry_hub.h
View File

@ -46,7 +46,7 @@ namespace Catch {
virtual void registerTest( TestCase const& testInfo ) = 0; virtual void registerTest( TestCase const& testInfo ) = 0;
virtual void registerTranslator( const IExceptionTranslator* translator ) = 0; virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0; virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
virtual void registerStartupException( std::exception_ptr const& exception ) noexcept = 0; virtual void registerStartupException() noexcept = 0;
}; };
IRegistryHub& getRegistryHub(); IRegistryHub& getRegistryHub();

4
include/internal/catch_registry_hub.cpp
View File

@ -56,8 +56,8 @@ namespace Catch {
void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override { void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
m_tagAliasRegistry.add( alias, tag, lineInfo ); m_tagAliasRegistry.add( alias, tag, lineInfo );
} }
void registerStartupException( std::exception_ptr const& exception ) noexcept override { void registerStartupException() noexcept override {
m_exceptionRegistry.add(exception); m_exceptionRegistry.add(std::current_exception());
} }
private: private:

2
include/internal/catch_tag_alias_autoregistrar.cpp
View File

@ -8,7 +8,7 @@ namespace Catch {
getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo); getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
} catch (...) { } catch (...) {
// Do not throw when constructing global objects, instead register the exception to be processed later // Do not throw when constructing global objects, instead register the exception to be processed later
getMutableRegistryHub().registerStartupException(std::current_exception()); getMutableRegistryHub().registerStartupException();
} }
} }

2
include/internal/catch_test_registry.cpp
View File

@ -29,7 +29,7 @@ namespace Catch {
lineInfo)); lineInfo));
} catch (...) { } catch (...) {
// Do not throw when constructing global objects, instead register the exception to be processed later // Do not throw when constructing global objects, instead register the exception to be processed later
getMutableRegistryHub().registerStartupException( std::current_exception() ); getMutableRegistryHub().registerStartupException();
} }
} }
} }