diff options
author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-20 16:30:38 +0200 |
---|---|---|
committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-25 13:59:48 +0200 |
commit | f1b92cf45f0ea07f22965ab6d9bca5fcd97e03a8 (patch) | |
tree | 8e198e81ee501b324f7fd4292a5f8835363bdea1 /src/buildtool/execution_api/git/git_api.hpp | |
parent | 5b3ee91c84d37fe2cd7d4ddd9d26370447564161 (diff) | |
download | justbuild-f1b92cf45f0ea07f22965ab6d9bca5fcd97e03a8.tar.gz |
Pass IExecutionApi to IExecutionApi by reference
...instead of not_null const ptr.
Diffstat (limited to 'src/buildtool/execution_api/git/git_api.hpp')
-rw-r--r-- | src/buildtool/execution_api/git/git_api.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/buildtool/execution_api/git/git_api.hpp b/src/buildtool/execution_api/git/git_api.hpp index 2b29fa40..53184988 100644 --- a/src/buildtool/execution_api/git/git_api.hpp +++ b/src/buildtool/execution_api/git/git_api.hpp @@ -54,8 +54,9 @@ class GitApi final : public IExecutionApi { [[nodiscard]] auto RetrieveToPaths( std::vector<Artifact::ObjectInfo> const& artifacts_info, std::vector<std::filesystem::path> const& output_paths, - std::optional<gsl::not_null<IExecutionApi*>> const& /*alternative*/ = - std::nullopt) const noexcept -> bool override { + std::optional< + gsl::not_null<const IExecutionApi*>> const& /*alternative*/ + = std::nullopt) const noexcept -> bool override { if (artifacts_info.size() != output_paths.size()) { Logger::Log(LogLevel::Error, "different number of digests and output paths."); @@ -175,10 +176,9 @@ class GitApi final : public IExecutionApi { // NOLINTNEXTLINE(misc-no-recursion) [[nodiscard]] auto RetrieveToCas( std::vector<Artifact::ObjectInfo> const& artifacts_info, - gsl::not_null<IExecutionApi*> const& api) const noexcept - -> bool override { + IExecutionApi const& api) const noexcept -> bool override { // Return immediately if target CAS is this CAS - if (this == api) { + if (this == &api) { return true; } @@ -238,14 +238,14 @@ class GitApi final : public IExecutionApi { IsExecutableObject(entry->Type())}, /*exception_is_fatal=*/true, [&api](ArtifactBlobContainer&& blobs) -> bool { - return api->Upload(std::move(blobs)); + return api.Upload(std::move(blobs)); })) { return false; } } } // Upload remaining blobs. - if (not api->Upload(std::move(tree_deps_only_blobs))) { + if (not api.Upload(std::move(tree_deps_only_blobs))) { return false; } content = tree->RawData(); @@ -270,15 +270,15 @@ class GitApi final : public IExecutionApi { IsExecutableObject(info.type)}, /*exception_is_fatal=*/true, [&api](ArtifactBlobContainer&& blobs) { - return api->Upload(std::move(blobs), - /*skip_find_missing=*/true); + return api.Upload(std::move(blobs), + /*skip_find_missing=*/true); })) { return false; } } // Upload remaining blobs to remote CAS. - return api->Upload(std::move(container), /*skip_find_missing=*/true); + return api.Upload(std::move(container), /*skip_find_missing=*/true); } [[nodiscard]] auto RetrieveToMemory( |