From 885199015e3c3334eff95f5d20f63ce1b14cd8f1 Mon Sep 17 00:00:00 2001
From: unex <63149623+UNEXENU@users.noreply.github.com>
Date: Fri, 21 Feb 2025 11:16:42 +0100
Subject: [PATCH] merge fix

---
 src/engine/Operation.cpp | 1 +
 src/engine/Service.cpp   | 2 +-
 test/ServiceTest.cpp     | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/engine/Operation.cpp b/src/engine/Operation.cpp
index 7f01ce8da9..6e8f82fc66 100644
--- a/src/engine/Operation.cpp
+++ b/src/engine/Operation.cpp
@@ -632,6 +632,7 @@ Operation::getRuntimeInfoChildren() {
     res.emplace_back(child->getRootOperation()->getRuntimeInfoPointer());
   }
   return res;
+}
 
 // _____________________________________________________________________________
 std::unique_ptr<Operation> Operation::clone() const {
diff --git a/src/engine/Service.cpp b/src/engine/Service.cpp
index 41dcb39e58..1dc82392bf 100644
--- a/src/engine/Service.cpp
+++ b/src/engine/Service.cpp
@@ -634,5 +634,5 @@ void Service::precomputeSiblingResult(std::shared_ptr<Operation> left,
 // _____________________________________________________________________________
 std::unique_ptr<Operation> Service::cloneImpl() const {
   return std::make_unique<Service>(_executionContext, parsedServiceClause_,
-                                   getResultFunction_);
+                                   networkFunctions_);
 }
diff --git a/test/ServiceTest.cpp b/test/ServiceTest.cpp
index 860c3e2f3c..ca9b78e14f 100644
--- a/test/ServiceTest.cpp
+++ b/test/ServiceTest.cpp
@@ -67,8 +67,7 @@ class ServiceTest : public ::testing::Test {
                 const boost::beast::http::verb& method,
                 std::string_view postData, std::string_view contentTypeHeader,
                 std::string_view acceptHeader,
-                const std::vector<std::pair<std::string, std::string>>&
-                    customHeaders) {
+                const std::vector<std::pair<std::string, std::string>>&) {
               // Check that the request parameters are as expected.
               //
               // NOTE: The first three are hard-coded in
@@ -832,7 +831,7 @@ TEST_F(ServiceTest, clone) {
           "PREFIX doof: <http://doof.org>",
           "{ }",
           true},
-      getResultFunctionFactory(
+      getNetworkFunctionsFactory(
           "http://localhorst:80/api",
           "PREFIX doof: <http://doof.org> SELECT ?x ?y WHERE { }",
           genJsonResult({"x", "y"}, {{"a", "b"}}),