From 9ef2ffa9acdc19453c81696aa2ed4da7cb84078c Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Thu, 21 Sep 2023 18:19:58 +0200
Subject: RemoteServeConfig: Remove problematic inheritance

This was causing the remote serve address to overwrite the one set
for remote execution.

Also, to keep things clean, some common remote server-related
methods and definitions were moved into their own library.
---
 src/buildtool/graph_traverser/graph_traverser.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/buildtool/graph_traverser/graph_traverser.hpp')

diff --git a/src/buildtool/graph_traverser/graph_traverser.hpp b/src/buildtool/graph_traverser/graph_traverser.hpp
index 9f99e6f2..8567395e 100644
--- a/src/buildtool/graph_traverser/graph_traverser.hpp
+++ b/src/buildtool/graph_traverser/graph_traverser.hpp
@@ -30,6 +30,7 @@
 #include "fmt/core.h"
 #include "gsl/gsl"
 #include "src/buildtool/common/cli.hpp"
+#include "src/buildtool/common/remote/remote_common.hpp"
 #include "src/buildtool/common/statistics.hpp"
 #include "src/buildtool/common/tree.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
@@ -270,7 +271,7 @@ class GraphTraverser {
     }
 
     [[nodiscard]] static auto CreateExecutionApi(
-        std::optional<RemoteExecutionConfig::ServerAddress> const& address)
+        std::optional<ServerAddress> const& address)
         -> gsl::not_null<IExecutionApi::Ptr> {
         if (address) {
             ExecutionConfiguration config;
-- 
cgit v1.2.3