diff options
Diffstat (limited to 'src/buildtool/execution_api/remote')
3 files changed, 9 insertions, 6 deletions
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp index 6094888d..34ae6af4 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp @@ -136,7 +136,7 @@ auto BazelNetwork::ExecuteBazelActionSync( } auto BazelNetwork::CreateReader() const noexcept -> BazelNetworkReader { - return BazelNetworkReader{instance_name_, *cas_}; + return BazelNetworkReader{instance_name_, cas_.get()}; } auto BazelNetwork::GetCachedActionResult( diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp index d945fdb3..9f4c34c8 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp @@ -24,9 +24,10 @@ #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/path.hpp" -BazelNetworkReader::BazelNetworkReader(std::string instance_name, - BazelCasClient const& cas) noexcept - : instance_name_{std::move(instance_name)}, cas_(cas) {} +BazelNetworkReader::BazelNetworkReader( + std::string instance_name, + gsl::not_null<BazelCasClient const*> const& cas) noexcept + : instance_name_{std::move(instance_name)}, cas_(*cas) {} BazelNetworkReader::BazelNetworkReader( BazelNetworkReader&& other, diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp index 9f1fbef2..2955fa57 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.hpp @@ -24,6 +24,7 @@ #include <unordered_map> #include <vector> +#include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/bazel_types.hpp" @@ -38,8 +39,9 @@ class BazelNetworkReader final { public: using DumpCallback = std::function<bool(std::string const&)>; - BazelNetworkReader(std::string instance_name, - BazelCasClient const& cas) noexcept; + explicit BazelNetworkReader( + std::string instance_name, + gsl::not_null<BazelCasClient const*> const& cas) noexcept; BazelNetworkReader( BazelNetworkReader&& other, |