From e82589e30f5e6fb9b682ad6f8bc67fcb9f70f93a Mon Sep 17 00:00:00 2001 From: Henning Kayser Date: Wed, 1 Jul 2020 19:04:11 +0200 Subject: [PATCH] Fix CMake warnings --- .../include/moveit/collision_detection/collision_matrix.h | 2 +- moveit_core/collision_detection/src/collision_matrix.cpp | 8 -------- moveit_core/robot_state/src/robot_state.cpp | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/moveit_core/collision_detection/include/moveit/collision_detection/collision_matrix.h b/moveit_core/collision_detection/include/moveit/collision_detection/collision_matrix.h index 3f3b50870fb..cecead93aef 100644 --- a/moveit_core/collision_detection/include/moveit/collision_detection/collision_matrix.h +++ b/moveit_core/collision_detection/include/moveit/collision_detection/collision_matrix.h @@ -91,7 +91,7 @@ class AllowedCollisionMatrix AllowedCollisionMatrix(const moveit_msgs::msg::AllowedCollisionMatrix& msg); /** @brief Copy constructor */ - AllowedCollisionMatrix(const AllowedCollisionMatrix& acm); + AllowedCollisionMatrix(const AllowedCollisionMatrix& acm) = default; /** @brief Get the type of the allowed collision between two elements. Return true if the entry is included in the * collision matrix. diff --git a/moveit_core/collision_detection/src/collision_matrix.cpp b/moveit_core/collision_detection/src/collision_matrix.cpp index e79ade940d5..444c20a66df 100644 --- a/moveit_core/collision_detection/src/collision_matrix.cpp +++ b/moveit_core/collision_detection/src/collision_matrix.cpp @@ -85,14 +85,6 @@ AllowedCollisionMatrix::AllowedCollisionMatrix(const moveit_msgs::msg::AllowedCo } } -AllowedCollisionMatrix::AllowedCollisionMatrix(const AllowedCollisionMatrix& acm) -{ - entries_ = acm.entries_; - allowed_contacts_ = acm.allowed_contacts_; - default_entries_ = acm.default_entries_; - default_allowed_contacts_ = acm.default_allowed_contacts_; -} - bool AllowedCollisionMatrix::getEntry(const std::string& name1, const std::string& name2, DecideContactFn& fn) const { auto it1 = allowed_contacts_.find(name1); diff --git a/moveit_core/robot_state/src/robot_state.cpp b/moveit_core/robot_state/src/robot_state.cpp index f0765357798..46e1cff5256 100644 --- a/moveit_core/robot_state/src/robot_state.cpp +++ b/moveit_core/robot_state/src/robot_state.cpp @@ -165,7 +165,7 @@ void RobotState::copyFrom(const RobotState& other) (robot_model_->getVariableCount() * (1 + ((has_velocity_ || has_acceleration_ || has_effort_) ? 1 : 0) + ((has_acceleration_ || has_effort_) ? 1 : 0)) + nr_doubles_for_dirty_joint_transforms); - memcpy(variable_joint_transforms_, other.variable_joint_transforms_, bytes); + memcpy((char*)variable_joint_transforms_, (char*)other.variable_joint_transforms_, bytes); } // copy attached bodies