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-09 22:01:49 +0200
committerMartin Hořeňovský2021-06-18 10:34:55 +0200
commita14d67cacede08349036cc13691861569a27d979 (patch)
tree104e54ef4cfb2e2c58e43d63392f0d9644daeb85 /src
parent4ce8a23edd40b77c5cff86265d03e286a988b35b (diff)
downloadcatch3-a14d67cacede08349036cc13691861569a27d979.tar.gz
ITracker::parent returns pointer not reference
We were already using it mostly to get pointers rather than references, so this makes it make more sense.
Diffstat (limited to 'src')
-rw-r--r--src/catch2/internal/catch_run_context.cpp4
-rw-r--r--src/catch2/internal/catch_test_case_tracker.cpp6
-rw-r--r--src/catch2/internal/catch_test_case_tracker.hpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp
index 927a27f8..e3a4bd1e 100644
--- a/src/catch2/internal/catch_run_context.cpp
+++ b/src/catch2/internal/catch_run_context.cpp
@@ -50,7 +50,7 @@ namespace Catch {
// without it, the code above creates 5 nested generators.
if ( currentTracker.nameAndLocation() == nameAndLocation ) {
auto thisTracker =
- currentTracker.parent().findChild( nameAndLocation );
+ currentTracker.parent()->findChild( nameAndLocation );
assert( thisTracker );
assert( thisTracker->isGeneratorTracker() );
tracker = static_cast<GeneratorTracker*>( thisTracker );
@@ -110,7 +110,7 @@ namespace Catch {
// This is safe: there is always at least one section
// tracker in a test case tracking tree
while ( !parent->isSectionTracker() ) {
- parent = &( parent->parent() );
+ parent = parent->parent();
}
assert( parent &&
"Missing root (test case) level section" );
diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp
index 6f7bf5d0..9354b362 100644
--- a/src/catch2/internal/catch_test_case_tracker.cpp
+++ b/src/catch2/internal/catch_test_case_tracker.cpp
@@ -99,9 +99,9 @@ namespace TestCaseTracking {
return m_runState != NotStarted && !isComplete();
}
- ITracker& TrackerBase::parent() {
+ ITracker* TrackerBase::parent() {
assert( m_parent ); // Should always be non-null except for root
- return *m_parent;
+ return m_parent;
}
void TrackerBase::openChild() {
@@ -176,7 +176,7 @@ namespace TestCaseTracking {
{
if( parent ) {
while( !parent->isSectionTracker() )
- parent = &parent->parent();
+ parent = parent->parent();
SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
addNextFilters( parentSection.m_filters );
diff --git a/src/catch2/internal/catch_test_case_tracker.hpp b/src/catch2/internal/catch_test_case_tracker.hpp
index a1974104..9e36a19d 100644
--- a/src/catch2/internal/catch_test_case_tracker.hpp
+++ b/src/catch2/internal/catch_test_case_tracker.hpp
@@ -60,7 +60,7 @@ namespace TestCaseTracking {
virtual bool isOpen() const = 0; // Started but not complete
virtual bool hasStarted() const = 0;
- virtual ITracker& parent() = 0;
+ virtual ITracker* parent() = 0;
// actions
virtual void close() = 0; // Successfully complete
@@ -138,7 +138,7 @@ namespace TestCaseTracking {
return m_runState != NotStarted;
}
- ITracker& parent() override;
+ ITracker* parent() override;
void openChild() override;