diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-26 09:50:25 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-27 11:24:20 +0200 |
| commit | a8034c539d6918f9e9822c751bd6c2853f530700 (patch) | |
| tree | 057f503794f6866c054fbf7fd7af524b0f6889ee | |
| parent | 76badf37b88c23081db72c206445d5f0bf4e28a4 (diff) | |
| download | justbuild-a8034c539d6918f9e9822c751bd6c2853f530700.tar.gz | |
Pass RemoteServeConfig by pointer for capturing
3 files changed, 9 insertions, 8 deletions
diff --git a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp index aa139dae..34056a31 100644 --- a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp +++ b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp @@ -106,8 +106,8 @@ auto ServeServerImpl::Run(RemoteServeConfig const& serve_config, return false; } - SourceTreeService sts{serve_config, &apis}; - TargetService ts{serve_config, &apis, serve ? &*serve : nullptr}; + SourceTreeService sts{&serve_config, &apis}; + TargetService ts{&serve_config, &apis, serve ? &*serve : nullptr}; ConfigurationService cs{}; grpc::ServerBuilder builder; diff --git a/src/buildtool/serve_api/serve_service/source_tree.hpp b/src/buildtool/serve_api/serve_service/source_tree.hpp index 6926a809..809ed889 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.hpp +++ b/src/buildtool/serve_api/serve_service/source_tree.hpp @@ -57,9 +57,9 @@ class SourceTreeService final ::justbuild::just_serve::GetRemoteTreeResponse; explicit SourceTreeService( - RemoteServeConfig const& serve_config, + gsl::not_null<RemoteServeConfig const*> const& serve_config, gsl::not_null<ApiBundle const*> const& apis) noexcept - : serve_config_{serve_config}, apis_{*apis} {} + : serve_config_{*serve_config}, apis_{*apis} {} // Retrieve the Git-subtree identifier from a given Git commit. // diff --git a/src/buildtool/serve_api/serve_service/target.hpp b/src/buildtool/serve_api/serve_service/target.hpp index 9146498c..7b1d0ec9 100644 --- a/src/buildtool/serve_api/serve_service/target.hpp +++ b/src/buildtool/serve_api/serve_service/target.hpp @@ -39,10 +39,11 @@ // The target-level cache service. class TargetService final : public justbuild::just_serve::Target::Service { public: - explicit TargetService(RemoteServeConfig const& serve_config, - gsl::not_null<ApiBundle const*> const& apis, - ServeApi const* serve = nullptr) noexcept - : serve_config_{serve_config}, apis_{*apis}, serve_{serve} {} + explicit TargetService( + gsl::not_null<RemoteServeConfig const*> const& serve_config, + gsl::not_null<ApiBundle const*> const& apis, + ServeApi const* serve = nullptr) noexcept + : serve_config_{*serve_config}, apis_{*apis}, serve_{serve} {} // Given a target-level caching key, returns the computed value. In doing // so, it can build on the associated endpoint passing the |