From 911922f33640b680de2b79c15dc33c1f4b3e9397 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Tue, 4 May 2021 10:35:38 +0200
Subject: [PATCH] cleanup
---
.../interface/objectpose/ObjectPoseStorageInterface.ice | 3 +--
source/RobotAPI/libraries/armem_objects/aron_conversions.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/source/RobotAPI/interface/objectpose/ObjectPoseStorageInterface.ice b/source/RobotAPI/interface/objectpose/ObjectPoseStorageInterface.ice
index adc6063bc..7256642ee 100644
--- a/source/RobotAPI/interface/objectpose/ObjectPoseStorageInterface.ice
+++ b/source/RobotAPI/interface/objectpose/ObjectPoseStorageInterface.ice
@@ -155,8 +155,7 @@ module armarx
};
interface ObjectPoseStorageInterface extends
- ObjectPoseTopic,
- armarx::articulated_object::ArticulatedObjectTopic
+ ObjectPoseTopic
{
// Object poses
diff --git a/source/RobotAPI/libraries/armem_objects/aron_conversions.h b/source/RobotAPI/libraries/armem_objects/aron_conversions.h
index 995c249f9..64dd1ac67 100644
--- a/source/RobotAPI/libraries/armem_objects/aron_conversions.h
+++ b/source/RobotAPI/libraries/armem_objects/aron_conversions.h
@@ -35,4 +35,4 @@ namespace armarx::armem
void fromAron(const arondto::RobotState& dto, RobotState& bo);
void toAron(arondto::RobotState& dto, const RobotState& bo);
-}
+} // namespace armarx::armem
--
GitLab