From c15cb9b76eadbc371a4f0f0b30f6034e2ca1c578 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 23 Apr 2021 17:30:04 +0200
Subject: [PATCH] Add c++ query overload
---
.../RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp | 5 +++++
source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
index 22c47eea2..0d8bbbc07 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
@@ -169,4 +169,9 @@ namespace armarx::armem::server
return processor.process(input, *memory);
}
+ client::QueryResult MemoryToIceAdapter::query(const client::QueryInput& input)
+ {
+ return client::QueryResult::fromIce(query(input.toIce()));
+ }
+
}
diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
index c6c61c6a1..ac1238071 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
@@ -3,7 +3,8 @@
#include <RobotAPI/interface/armem/server/MemoryInterface.h>
#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
-#include "../core/Memory.h"
+#include <RobotAPI/libraries/armem/core/Memory.h>
+#include <RobotAPI/libraries/armem/client/Query.h>
namespace armarx::armem::server
@@ -43,6 +44,7 @@ namespace armarx::armem::server
// READING
query::data::Result query(const armem::query::data::Input& input);
+ client::QueryResult query(const client::QueryInput& input);
public:
--
GitLab