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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal/catch_test_case_tracker.cpp
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-12-04 22:57:34 +0100
committerMartin Hořeňovský2020-12-05 15:19:23 +0100
commit4b51d0dd3be90f4faf3c10f60d1923ad47a792d7 (patch)
treeade421b973b1d137102c37f5f2f0d8f9f904eaee /src/catch2/internal/catch_test_case_tracker.cpp
parent6350851f9af96a1c35da92b18ca7cb3d90fa67c9 (diff)
downloadcatch3-4b51d0dd3be90f4faf3c10f60d1923ad47a792d7.tar.gz
Remove rest of std::shared_ptr usage in Trackers
Closes #2088
Diffstat (limited to 'src/catch2/internal/catch_test_case_tracker.cpp')
-rw-r--r--src/catch2/internal/catch_test_case_tracker.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp
index b405ce86..2e8c3169 100644
--- a/src/catch2/internal/catch_test_case_tracker.cpp
+++ b/src/catch2/internal/catch_test_case_tracker.cpp
@@ -12,7 +12,6 @@
#include <algorithm>
#include <cassert>
-#include <memory>
#if defined(__clang__)
# pragma clang diagnostic push
@@ -30,8 +29,8 @@ namespace TestCaseTracking {
ITracker::~ITracker() = default;
- void ITracker::addChild( ITrackerPtr const& child ) {
- m_children.push_back( child );
+ void ITracker::addChild( ITrackerPtr&& child ) {
+ m_children.push_back( std::move(child) );
}
ITracker* ITracker::findChild( NameAndLocation const& nameAndLocation ) {
@@ -50,7 +49,10 @@ namespace TestCaseTracking {
ITracker& TrackerContext::startRun() {
using namespace std::string_literals;
- m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}"s, CATCH_INTERNAL_LINEINFO ), *this, nullptr );
+ m_rootTracker = Catch::Detail::make_unique<SectionTracker>(
+ NameAndLocation( "{root}"s, CATCH_INTERNAL_LINEINFO ),
+ *this,
+ nullptr );
m_currentTracker = nullptr;
m_runState = Executing;
return *m_rootTracker;
@@ -204,7 +206,7 @@ namespace TestCaseTracking {
assert( childTracker->isSectionTracker() );
section = static_cast<SectionTracker*>( childTracker );
} else {
- auto newSection = std::make_shared<SectionTracker>(
+ auto newSection = Catch::Detail::make_unique<SectionTracker>(
nameAndLocation, ctx, &currentTracker );
section = newSection.get();
currentTracker.addChild( std::move( newSection ) );