diff --git a/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.h b/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.h index a82cc1c95055a28c047afdfa10d9947fa7a843fd..dd6d93f187a0b74c0f1a45a3ad4bb1104c77fb92 100644 --- a/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.h +++ b/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.h @@ -79,8 +79,8 @@ namespace armarx * @param observer Interface proxy to DebugObserver topic. * @return These values are published on the RobotUnitObserver in the channel "ControlDevices". The keys of the map are prepended * with "{ControlDeviceName}_{ControlModeName}_" and are used as keys of the datafields. - * - */ + * + */ virtual StringVariantBaseMap publish(const DebugDrawerInterfacePrx& draw, const DebugObserverInterfacePrx& observer) const; protected: diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThreadDataBuffer.cpp b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThreadDataBuffer.cpp index b1c3d72e46d7c5beb2e2ca8871d154913f5ff143..36e7c7a9a3fc78e3529fe7f4af00a8974a0e61f0 100644 --- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThreadDataBuffer.cpp +++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThreadDataBuffer.cpp @@ -232,7 +232,7 @@ namespace armarx void ControlThreadDataBuffer::setActivateControllersRequest(std::set<NJointControllerPtr, std::greater<NJointControllerPtr>> ctrls) { throwIfInControlThread(BOOST_CURRENT_FUNCTION); - std::lock_guard<std::recursive_mutex> guardRequested{controllersRequestedMutex}; + std::lock_guard<std::recursive_mutex> guardRequested {controllersRequestedMutex}; throwIfDevicesNotReady(__FUNCTION__); //erase nullptr ctrls.erase(nullptr);