Skip to content

Commit 4dfcf09

Browse files
committed
clang-format-14
1 parent cd0ab88 commit 4dfcf09

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed

core/include/moveit/task_constructor/stage_p.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,13 @@
5050
#include <chrono>
5151

5252
// define pimpl() functions accessing correctly casted pimpl_ pointer
53-
#define PIMPL_FUNCTIONS(Class) \
54-
const Class##Private* Class::pimpl() const { return static_cast<const Class##Private*>(pimpl_); } \
55-
Class##Private* Class::pimpl() { return static_cast<Class##Private*>(pimpl_); }
53+
#define PIMPL_FUNCTIONS(Class) \
54+
const Class##Private* Class::pimpl() const { \
55+
return static_cast<const Class##Private*>(pimpl_); \
56+
} \
57+
Class##Private* Class::pimpl() { \
58+
return static_cast<Class##Private*>(pimpl_); \
59+
}
5660

5761
namespace moveit {
5862
namespace task_constructor {

core/src/cost_terms.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ double Clearance::operator()(const SubTrajectory& s, std::string& comment) const
241241
auto& state_properties{ state->properties() };
242242
auto& stage_properties{ s.creator()->properties() };
243243
request.group_name = state_properties.hasProperty(group_property) ?
244-
state_properties.get<std::string>(group_property) :
245-
stage_properties.get<std::string>(group_property);
244+
state_properties.get<std::string>(group_property) :
245+
stage_properties.get<std::string>(group_property);
246246

247247
// look at all forbidden collisions involving group_name
248248
request.enableGroup(state->scene()->getRobotModel());

core/src/stages/compute_ik.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ void ComputeIK::compute() {
289289
if (value.empty()) { // property undefined
290290
// determine IK link from eef/group
291291
if (!(link = eef_jmg ? robot_model->getLinkModel(eef_jmg->getEndEffectorParentGroup().second) :
292-
jmg->getOnlyOneEndEffectorTip())) {
292+
jmg->getOnlyOneEndEffectorTip())) {
293293
ROS_WARN_STREAM_NAMED("ComputeIK", "Failed to derive IK target link");
294294
return;
295295
}

core/src/stages/modify_planning_scene.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void ModifyPlanningScene::attachObjects(planning_scene::PlanningScene& scene,
112112
if (invert)
113113
attach = !attach;
114114
obj.object.operation = attach ? static_cast<int8_t>(moveit_msgs::CollisionObject::ADD) :
115-
static_cast<int8_t>(moveit_msgs::CollisionObject::REMOVE);
115+
static_cast<int8_t>(moveit_msgs::CollisionObject::REMOVE);
116116
for (const std::string& name : pair.second.first) {
117117
obj.object.id = name;
118118
scene.processAttachedCollisionObjectMsg(obj);

core/src/stages/simple_grasp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void SimpleGraspBase::setup(std::unique_ptr<Stage>&& generator, bool forward) {
129129
const std::string& eef = p.get<std::string>("eef");
130130
moveit_msgs::AttachedCollisionObject obj;
131131
obj.object.operation = forward ? static_cast<int8_t>(moveit_msgs::CollisionObject::ADD) :
132-
static_cast<int8_t>(moveit_msgs::CollisionObject::REMOVE);
132+
static_cast<int8_t>(moveit_msgs::CollisionObject::REMOVE);
133133
obj.link_name = scene->getRobotModel()->getEndEffector(eef)->getEndEffectorParentGroup().second;
134134
obj.object.id = p.get<std::string>("object");
135135
scene->processAttachedCollisionObjectMsg(obj);

core/test/test_stage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void attachObject(PlanningScene& scene, const std::string& object, const std::st
119119
moveit_msgs::AttachedCollisionObject obj;
120120
obj.link_name = link;
121121
obj.object.operation = attach ? static_cast<int8_t>(moveit_msgs::CollisionObject::ADD) :
122-
static_cast<int8_t>(moveit_msgs::CollisionObject::REMOVE);
122+
static_cast<int8_t>(moveit_msgs::CollisionObject::REMOVE);
123123
obj.object.id = object;
124124
scene.processAttachedCollisionObjectMsg(obj);
125125
}

visualization/motion_planning_tasks/properties/property_from_yaml.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ScopedYamlEvent
5353
{
5454
public:
5555
~ScopedYamlEvent() { yaml_event_delete(&event_); }
56-
operator yaml_event_t const &() const { return event_; }
56+
operator yaml_event_t const&() const { return event_; }
5757
operator yaml_event_t&() { return event_; }
5858

5959
private:

0 commit comments

Comments
 (0)