From cc86dd8a74aaeef64634b25034e371edd161f5ed Mon Sep 17 00:00:00 2001 From: v4hn Date: Fri, 20 Mar 2020 17:01:53 +0100 Subject: [PATCH] rename Task::erase -> eraseTaskCallback `erase` is too general for a container class, when it's not actually about erasing children or the container itself. --- core/include/moveit/task_constructor/task.h | 2 +- core/src/task.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/include/moveit/task_constructor/task.h b/core/include/moveit/task_constructor/task.h index 9fe228b0..0aea89c2 100644 --- a/core/include/moveit/task_constructor/task.h +++ b/core/include/moveit/task_constructor/task.h @@ -105,7 +105,7 @@ public: /// add function to be called after each top-level iteration TaskCallbackList::const_iterator addTaskCallback(TaskCallback&& cb); /// remove function callback - void erase(TaskCallbackList::const_iterator which); + void eraseTaskCallback(TaskCallbackList::const_iterator which); /// expose SolutionCallback API using WrapperBase::SolutionCallback; diff --git a/core/src/task.cpp b/core/src/task.cpp index cd21b39d..4b740968 100644 --- a/core/src/task.cpp +++ b/core/src/task.cpp @@ -235,7 +235,7 @@ Task::TaskCallbackList::const_iterator Task::addTaskCallback(TaskCallback&& cb) return --(impl->task_cbs_.cend()); } -void Task::erase(TaskCallbackList::const_iterator which) { +void Task::eraseTaskCallback(TaskCallbackList::const_iterator which) { pimpl()->task_cbs_.erase(which); }