diff --git a/core/include/moveit/task_constructor/storage.h b/core/include/moveit/task_constructor/storage.h index d32101c9..7a8e56a7 100644 --- a/core/include/moveit/task_constructor/storage.h +++ b/core/include/moveit/task_constructor/storage.h @@ -106,7 +106,7 @@ public: InterfaceState(const planning_scene::PlanningSceneConstPtr& ps); /// copy an existing InterfaceState, but not including incoming/outgoing trajectories - InterfaceState(const InterfaceState& existing); + InterfaceState(const InterfaceState& other); inline const planning_scene::PlanningSceneConstPtr& scene() const { return scene_; } inline const Solutions& incomingTrajectories() const { return incoming_trajectories_; } diff --git a/core/src/container.cpp b/core/src/container.cpp index f8cc800f..d7f9f0a2 100644 --- a/core/src/container.cpp +++ b/core/src/container.cpp @@ -867,7 +867,7 @@ void ParallelContainerBase::spawn(InterfaceState &&state, SubTrajectory&& t) it->setEndState(*state_it); impl->failures_.push_back(&*it); } else { - // directly spawn states in push interfaces + // directly spawn states into push interfaces impl->prevEnds()->add(InterfaceState(state), NULL, &*it); impl->nextStarts()->add(std::move(state), &*it, NULL); impl->solutions_.insert(&*it); diff --git a/core/src/storage.cpp b/core/src/storage.cpp index ae05d77c..baadd92b 100644 --- a/core/src/storage.cpp +++ b/core/src/storage.cpp @@ -50,8 +50,8 @@ InterfaceState::InterfaceState(const planning_scene::PlanningSceneConstPtr &ps) { } -InterfaceState::InterfaceState(const InterfaceState &existing) - : scene_(existing.scene_), properties_(existing.properties_) +InterfaceState::InterfaceState(const InterfaceState &other) + : scene_(other.scene_), properties_(other.properties_) { } @@ -69,7 +69,7 @@ Interface::iterator Interface::add(InterfaceState &&state, SolutionBase* incomin // move state to a list node std::list container; auto it = container.insert(container.end(), std::move(state)); - assert(it->owner_ == nullptr); + assert(it->owner_ == nullptr); // state can only be added once to an interface it->owner_ = this; // configure state: inherit priority from other end's state and add current solution's cost