From 042bd23d2a171844c355f7edadae825556d0a7a0 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 23 Apr 2021 13:46:49 +0200
Subject: [PATCH] Make ObjectMemoryInterface extend MemoryInterface, not
ObjectPoseObserverInterface
---
.../RobotAPI/interface/armem/server/ObjectMemoryInterface.ice | 3 ++-
.../interface/objectpose/ObjectPoseObserverInterface.ice | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/RobotAPI/interface/armem/server/ObjectMemoryInterface.ice b/source/RobotAPI/interface/armem/server/ObjectMemoryInterface.ice
index 3418f7d2f..c62805cfa 100644
--- a/source/RobotAPI/interface/armem/server/ObjectMemoryInterface.ice
+++ b/source/RobotAPI/interface/armem/server/ObjectMemoryInterface.ice
@@ -42,7 +42,8 @@ module armarx
};
interface ObjectMemoryInterface extends
- ObjectInstanceSegmentInterface
+ MemoryInterface
+ , ObjectInstanceSegmentInterface
{
};
diff --git a/source/RobotAPI/interface/objectpose/ObjectPoseObserverInterface.ice b/source/RobotAPI/interface/objectpose/ObjectPoseObserverInterface.ice
index 65d24a3ff..ec1da654c 100644
--- a/source/RobotAPI/interface/objectpose/ObjectPoseObserverInterface.ice
+++ b/source/RobotAPI/interface/objectpose/ObjectPoseObserverInterface.ice
@@ -154,7 +154,6 @@ module armarx
interface ObjectPoseObserverInterface extends
ObjectPoseTopic
- , armem::server::MemoryInterface
{
// Object poses
--
GitLab