Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Fix/clang compiler errors #283

Merged
merged 4 commits into from
Nov 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class PilzJointTrajectoryController

PilzJointTrajectoryController();

bool init(HardwareInterface* hw, ros::NodeHandle& root_nh, ros::NodeHandle& controller_nh);
bool init(HardwareInterface* hw, ros::NodeHandle& root_nh, ros::NodeHandle& controller_nh) override;

/**
* @brief Returns true if the controller currently is executing a trajectory. False otherwise.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ INSTANTIATE_TEST_CASE_P(
std::pair<OperationModes::_value_type, double>(OperationModes::UNKNOWN, 0.0),
std::pair<OperationModes::_value_type, double>(OperationModes::T1, 0.1),
std::pair<OperationModes::_value_type, double>(OperationModes::AUTO, 1.0)
)
),
);

} // namespace operation_mode_setup_executor_tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,21 @@ MATCHER_P(StoState, x, "Sto state " + std::string(negation ? "is not" : "is") +
MATCHER_P2(NameAtI, i, name,
"Name at index " + PrintToString(i) + std::string(negation ? "is not" : "is") + ": " + name + ".")
{
return static_cast<unsigned long>(i) < arg->name.size() && arg->name.at((unsigned)i).compare(name) == 0;
return static_cast<size_t>(i) < arg->name.size() && arg->name.at(static_cast<size_t>(i)).compare(name) == 0;
}

MATCHER_P2(SpeedAtIGe, i, x,
"Speed at index " + PrintToString(i) + std::string(negation ? "is not" : "is") + " greater or equal to" +
PrintToString(x) + ".")
{
return static_cast<unsigned long>(i) < arg->name.size() && arg->speed.at(i) >= x;
return static_cast<size_t>(i) < arg->name.size() && arg->speed.at(static_cast<size_t>(i)) >= x;
}

MATCHER_P2(SpeedAtILe, i, x,
"Speed at index " + PrintToString(i) + std::string(negation ? "is not" : "is") + " less or equal to" +
PrintToString(x) + ".")
{
return static_cast<unsigned long>(i) < arg->name.size() && arg->speed.at(i) <= x;
return static_cast<size_t>(i) < arg->name.size() && arg->speed.at(static_cast<size_t>(i)) <= x;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion prbt_support/test/urdf_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void URDFKinematicsTest::SetUp()
testDataSet_.push_back(TestDataPoint("TestPos10", { 0, 0, 0, 0, 0, M_PI_2}, Eigen::Vector3d(0, 0, L0+L1+L2+L3)));
}

INSTANTIATE_TEST_CASE_P(InstantiationName, URDFKinematicsTest, ::testing::Values(PARAM_MODEL));
INSTANTIATE_TEST_CASE_P(InstantiationName, URDFKinematicsTest, ::testing::Values(PARAM_MODEL), );
/**
* \brief test the kinematics of urdf model
*
Expand Down