Skip to content

Fix clang -Werror complains #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
v4hn wants to merge 3 commits into
base: melodic-devel
Choose a base branch
from
Open

Fix clang -Werror complains #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddf1d14
mark virtual overrides as override
v4hn Nov 30, 2023
32bf686
correctly define CONNECT_HANDSHAKE as unsigned
v4hn Nov 30, 2023
01f185d
correct use of remove-erase pattern
v4hn Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion industrial_robot_client/src/joint_trajectory_action.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ JointTrajectoryAction::JointTrajectoryAction() :

// The controller joint names parameter includes empty joint names for those joints not supported
// by the controller. These are removed since the trajectory action should ignore these.
std::remove(joint_names_.begin(), joint_names_.end(), std::string());
joint_names_.erase(std::remove(joint_names_.begin(), joint_names_.end(), std::string()), joint_names_.end());
ROS_INFO_STREAM_NAMED(name_, "Filtered joint names to " << joint_names_.size() << " joints");

pub_trajectory_command_ = node_.advertise<trajectory_msgs::JointTrajectory>("joint_path_command", 1);
Expand Down
6 changes: 3 additions & 3 deletions industrial_trajectory_filters/include/industrial_trajectory_filters/filter_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,10 @@ template<typename T>
* from the old FilterBase interface class. The filtered trajectory is finally
* saved in the MotionPlanResponse object.
*/
virtual bool adaptAndPlan(const PlannerFn &planner, const planning_scene::PlanningSceneConstPtr &planning_scene,
bool adaptAndPlan(const PlannerFn &planner, const planning_scene::PlanningSceneConstPtr &planning_scene,
const planning_interface::MotionPlanRequest &req,
planning_interface::MotionPlanResponse &res,
std::vector<std::size_t> &added_path_index) const
std::vector<std::size_t> &added_path_index) const override
{

// non const pointer to this
Expand Down Expand Up @@ -272,7 +272,7 @@ template<typename T>
* @brief Return description string
* @return description (as a string)
*/
virtual std::string getDescription() const
std::string getDescription() const override
{
// non const pointer to this
FilterBase<MessageAdapter> *p = const_cast<FilterBase<MessageAdapter>*>(this);
Expand Down
8 changes: 4 additions & 4 deletions industrial_trajectory_filters/src/add_smoothing_filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ class AddSmoothingFilter : public planning_request_adapter::PlanningRequestAdapt
}
if(!smoothing_filter_.init(filter_coef_))
ROS_ERROR("Initialization error on smoothing filter. Requires an odd number of coeficients");

};

/*! \brief Destructor */
~AddSmoothingFilter(){ };

/*! \brief Returns a short description of this plugin */
virtual std::string getDescription() const { return "Add Smoothing Trajectory Filter"; }
std::string getDescription() const override { return "Add Smoothing Trajectory Filter"; }

/*! \brief The work hourse of planning request adapters
* \param planner A function called somewhere within this subroutine
Expand All @@ -118,11 +118,11 @@ class AddSmoothingFilter : public planning_request_adapter::PlanningRequestAdapt
* \param res the response, includes the robot trajectory and other info
* \param added_path_index, a index of the points added by this adapter, which in this case will be empty
*/
virtual bool adaptAndPlan(const PlannerFn &planner,
bool adaptAndPlan(const PlannerFn &planner,
const planning_scene::PlanningSceneConstPtr& planning_scene,
const planning_interface::MotionPlanRequest &req,
planning_interface::MotionPlanResponse &res,
std::vector<std::size_t> &added_path_index) const
std::vector<std::size_t> &added_path_index) const override
{
// do anything prior to calling the planner here
// ....
Expand Down
2 changes: 1 addition & 1 deletion simple_message/include/simple_message/socket/udp_socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class UdpSocket : public industrial::simple_socket::SimpleSocket
/**
* \brief udp socket connect handshake value
*/
static const char CONNECT_HANDSHAKE = 142;
static const unsigned char CONNECT_HANDSHAKE = 142;

char udp_read_buffer_[MAX_BUFFER_SIZE + 1];
char* udp_read_head_;
Expand Down