diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.cpp b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.cpp index b89bdce7eefa94d0f92ddb36fcb2b5a1a645b653..62c29273e7ffc2bf611c41355bb350f71323affa 100644 --- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.cpp +++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.cpp @@ -200,7 +200,7 @@ namespace armarx return minSelfDistance; } - void SelfCollisionChecker::componentPropertiesUpdated(const std::set<std::string>& changed) + void SelfCollisionChecker::_componentPropertiesUpdated(const std::set<std::string>& changed) { throwIfInControlThread(BOOST_CURRENT_FUNCTION); if (changed.count("SelfCollisionCheck_Frequency")) diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.h b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.h index a88b0b3c7b0ed1f9e89ad88a6edf3bcf6e64bfd4..a2323163d981b6476a2e1b72eb06c4cf48ab358d 100644 --- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.h +++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.h @@ -86,6 +86,8 @@ namespace armarx void _postFinishControlThreadInitialization(); /// @see ModuleBase::_preFinishRunning void _preFinishRunning(); + /// @see ModuleBase::_componentPropertiesUpdated + void _componentPropertiesUpdated(const std::set<std::string>& changed); // //////////////////////////////////////////////////////////////////////////////////////// // // ///////////////////////////////////// ice interface //////////////////////////////////// // // //////////////////////////////////////////////////////////////////////////////////////// // @@ -117,12 +119,6 @@ namespace armarx */ float getSelfCollisionAvoidanceDistance(const Ice::Current& = GlobalIceCurrent) const override; // //////////////////////////////////////////////////////////////////////////////////////// // - // ////////////////////////////////// Component interface ///////////////////////////////// // - // //////////////////////////////////////////////////////////////////////////////////////// // - public: - /// @see armarx::Component::componentPropertiesUpdated - void componentPropertiesUpdated(const std::set<std::string>& changed) override; - // //////////////////////////////////////////////////////////////////////////////////////// // // //////////////////////////////////// implementation //////////////////////////////////// // // //////////////////////////////////////////////////////////////////////////////////////// // private: