Skip to content

Commit a24601a

Browse files
authored
Merge pull request #77 from olivier-stasse/devel
Fix inclusion order for robot-utils.hh
2 parents 8d4b7a6 + 967a5f2 commit a24601a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

include/dynamic_graph_bridge/ros_parameter.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ namespace dynamicgraph {
55

66
bool parameter_server_read_robot_description();
77

8-
};
8+
}
99
#endif /* _ROS_DYNAMIC_GRAPH_PARAMETER_ */

src/ros_parameter.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include <sot/core/robot-utils.hh>
2+
13
#include "pinocchio/multibody/model.hpp"
24
#include "pinocchio/parsers/urdf.hpp"
35

@@ -7,7 +9,6 @@
79

810
#include <urdf_parser/urdf_parser.h>
911

10-
#include <sot/core/robot-utils.hh>
1112
#include <ros/ros.h>
1213
#include "dynamic_graph_bridge/ros_parameter.hh"
1314

@@ -30,7 +31,7 @@ bool parameter_server_read_robot_description()
3031
// Search for the robot util related to robot_name.
3132
sot::RobotUtilShrPtr aRobotUtil = sot::getRobotUtil(model_name);
3233
// If does not exist then it is created.
33-
if (aRobotUtil != sot::RefVoidRobotUtil())
34+
if (aRobotUtil == sot::RefVoidRobotUtil())
3435
aRobotUtil = sot::createRobotUtil(model_name);
3536

3637
// If the creation is fine
@@ -50,4 +51,4 @@ bool parameter_server_read_robot_description()
5051

5152
}
5253

53-
};
54+
}

0 commit comments

Comments
 (0)