From 72b171430b5c9e90aec5173e33d36f247d308128 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Fri, 23 Sep 2022 16:41:47 +0200 Subject: AnalysedTarget: Make shared pointer's content immutable ... while technically not required, it makes it harder to run into nasty errors. --- src/buildtool/main/analyse.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/buildtool/main/analyse.cpp') diff --git a/src/buildtool/main/analyse.cpp b/src/buildtool/main/analyse.cpp index 6f329391..cfbe939d 100644 --- a/src/buildtool/main/analyse.cpp +++ b/src/buildtool/main/analyse.cpp @@ -75,9 +75,9 @@ void DetectAndReportPending(std::string const& name, return std::nullopt; } -[[nodiscard]] auto SwitchToActionInput( - const std::shared_ptr& target, - const ActionDescription::Ptr& action) -> std::shared_ptr { +[[nodiscard]] auto SwitchToActionInput(const AnalysedTargetPtr& target, + const ActionDescription::Ptr& action) + -> AnalysedTargetPtr { auto inputs = Expression::map_t::underlying_map_t{}; for (auto const& [k, v] : action->Inputs()) { inputs[k] = ExpressionPtr{Expression{v}}; @@ -93,7 +93,7 @@ void DetectAndReportPending(std::string const& name, } auto provides_exp = Expression::FromJson(provides); - return std::make_shared( + return std::make_shared( TargetResult{inputs_exp, provides_exp, Expression::kEmptyMap}, std::vector{action}, target->Blobs(), @@ -124,7 +124,7 @@ void DetectAndReportPending(std::string const& name, result_map, jobs); Logger::Log(LogLevel::Info, "Requested target is {}", id.ToString()); - std::shared_ptr target{}; + AnalysedTargetPtr target{}; bool failed{false}; { -- cgit v1.2.3