From 4a1ca1ab557a9b311a89be6131abea8cdafb4a93 Mon Sep 17 00:00:00 2001 From: Martin Hostettler Date: Sun, 21 Apr 2019 23:29:52 +0200 Subject: [PATCH] TrackerContext: Remove misleading instance static method. TrackerContext is not used as singleton, so just remove this misleading method --- include/internal/catch_test_case_tracker.cpp | 5 ----- include/internal/catch_test_case_tracker.h | 2 -- .../IntrospectiveTests/PartTracker.tests.cpp | 15 --------------- 3 files changed, 22 deletions(-) diff --git a/include/internal/catch_test_case_tracker.cpp b/include/internal/catch_test_case_tracker.cpp index 210f2730..1ef830d1 100644 --- a/include/internal/catch_test_case_tracker.cpp +++ b/include/internal/catch_test_case_tracker.cpp @@ -32,11 +32,6 @@ namespace TestCaseTracking { ITracker::~ITracker() = default; - TrackerContext& TrackerContext::instance() { - static TrackerContext s_instance; - return s_instance; - } - ITracker& TrackerContext::startRun() { m_rootTracker = std::make_shared( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr ); m_currentTracker = nullptr; diff --git a/include/internal/catch_test_case_tracker.h b/include/internal/catch_test_case_tracker.h index 17276001..97b63b8b 100644 --- a/include/internal/catch_test_case_tracker.h +++ b/include/internal/catch_test_case_tracker.h @@ -71,8 +71,6 @@ namespace TestCaseTracking { public: - static TrackerContext& instance(); - ITracker& startRun(); void endRun(); diff --git a/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp b/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp index 9372b1c3..97423265 100644 --- a/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp @@ -8,21 +8,6 @@ #include "internal/catch_suppress_warnings.h" #include "internal/catch_test_case_tracker.h" - -namespace Catch -{ - class LocalContext { - - public: - TrackerContext& operator()() const { - return TrackerContext::instance(); - } - }; - -} // namespace Catch - -// ------------------- - #include "catch.hpp" using namespace Catch;