3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Detail::make_unique<T> in more places

This commit is contained in:
Martin Hořeňovský 2021-08-10 00:16:05 +02:00
parent 3ec63324a8
commit 3579c055c8
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/catch2/catch_session.cpp
View File

@ -43,19 +43,13 @@ namespace Catch {
return createReporter(config->getReporterName(), config); return createReporter(config->getReporterName(), config);
} }
// On older platforms, returning unique_ptr<ListeningReporter> auto multi = Detail::make_unique<ListeningReporter>(config);
// when the return type is unique_ptr<IStreamingReporter>
// doesn't compile without a std::move call. However, this causes
// a warning on newer platforms. Thus, we have to work around
// it a bit and downcast the pointer manually.
auto ret = Detail::unique_ptr<IStreamingReporter>(new ListeningReporter(config));
auto& multi = static_cast<ListeningReporter&>(*ret);
auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners(); auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
for (auto const& listener : listeners) { for (auto const& listener : listeners) {
multi.addListener(listener->create(Catch::ReporterConfig(config))); multi->addListener(listener->create(Catch::ReporterConfig(config)));
} }
multi.addReporter(createReporter(config->getReporterName(), config)); multi->addReporter(createReporter(config->getReporterName(), config));
return ret; return multi;
} }
class TestGroup { class TestGroup {

2
src/catch2/catch_test_case_info.cpp
View File

@ -107,7 +107,7 @@ namespace Catch {
makeTestCaseInfo(std::string const& _className, makeTestCaseInfo(std::string const& _className,
NameAndTags const& nameAndTags, NameAndTags const& nameAndTags,
SourceLineInfo const& _lineInfo ) { SourceLineInfo const& _lineInfo ) {
return Detail::unique_ptr<TestCaseInfo>(new TestCaseInfo(_className, nameAndTags, _lineInfo)); return Detail::make_unique<TestCaseInfo>(_className, nameAndTags, _lineInfo);
} }
TestCaseInfo::TestCaseInfo(std::string const& _className, TestCaseInfo::TestCaseInfo(std::string const& _className,

2
src/catch2/internal/catch_stream.cpp
View File

@ -145,7 +145,7 @@ namespace Detail {
auto add() -> std::size_t { auto add() -> std::size_t {
if( m_unused.empty() ) { if( m_unused.empty() ) {
m_streams.push_back( Detail::unique_ptr<std::ostringstream>( new std::ostringstream ) ); m_streams.push_back( Detail::make_unique<std::ostringstream>() );
return m_streams.size()-1; return m_streams.size()-1;
} }
else { else {