From 03d8cda380e61fee05eee7170deb7241f07648ee Mon Sep 17 00:00:00 2001 From: Rainer Kartmann <rainer.kartmann@kit.edu> Date: Wed, 11 Aug 2021 16:32:08 +0200 Subject: [PATCH] Fix minor stuff --- source/RobotAPI/libraries/armem/server/wm/memory_definitions.h | 1 - .../RobotAPI/libraries/armem_objects/server/class/Segment.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/source/RobotAPI/libraries/armem/server/wm/memory_definitions.h b/source/RobotAPI/libraries/armem/server/wm/memory_definitions.h index cb4aa1a0c..5d2036f05 100644 --- a/source/RobotAPI/libraries/armem/server/wm/memory_definitions.h +++ b/source/RobotAPI/libraries/armem/server/wm/memory_definitions.h @@ -13,7 +13,6 @@ #include <RobotAPI/libraries/armem/core/wm/detail/data_lookup_mixins.h> #include <mutex> -#include <optional> namespace armarx::armem::server::wm diff --git a/source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp b/source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp index aac9200bc..ed941f122 100644 --- a/source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp +++ b/source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp @@ -124,7 +124,7 @@ namespace armarx::armem::server::obj::clazz { try { - std::optional<arondto::ObjectClass> aron = coreSegment->doLocked([&coreSegment, &entity]() + std::optional<arondto::ObjectClass> aron = coreSegment->doLocked([this, &entity]() { return coreSegment->findLatestInstanceDataAs<arondto::ObjectClass>(entityID, 0); }); -- GitLab