diff options
author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-09-23 16:41:47 +0200 |
---|---|---|
committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-10-05 14:35:36 +0200 |
commit | 72b171430b5c9e90aec5173e33d36f247d308128 (patch) | |
tree | 400d162cabf30763ccb5d3ab493ecf302e47bc48 /src/buildtool/main/analyse.cpp | |
parent | 161bf4ab797a481142315d1803170cf4be590036 (diff) | |
download | justbuild-72b171430b5c9e90aec5173e33d36f247d308128.tar.gz |
AnalysedTarget: Make shared pointer's content immutable
... while technically not required, it makes it harder to
run into nasty errors.
Diffstat (limited to 'src/buildtool/main/analyse.cpp')
-rw-r--r-- | src/buildtool/main/analyse.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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<AnalysedTarget>& target, - const ActionDescription::Ptr& action) -> std::shared_ptr<AnalysedTarget> { +[[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<AnalysedTarget>( + return std::make_shared<AnalysedTarget const>( TargetResult{inputs_exp, provides_exp, Expression::kEmptyMap}, std::vector<ActionDescription::Ptr>{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<AnalysedTarget> target{}; + AnalysedTargetPtr target{}; bool failed{false}; { |