Skip to content

Commit 16f5d9d

Browse files
committed
rename uint to uint32_t
1 parent dae7591 commit 16f5d9d

1 file changed

Lines changed: 61 additions & 0 deletions

File tree

patch/ros-lyrical-moveit-task-constructor-core.patch

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
diff --git a/include/moveit/task_constructor/introspection.h b/include/moveit/task_constructor/introspection.h
2+
index cf4dfb7..b7e26d5 100644
3+
--- a/include/moveit/task_constructor/introspection.h
4+
+++ b/include/moveit/task_constructor/introspection.h
5+
@@ -111,7 +111,7 @@ private:
6+
/// retrieve or set id of given stage
7+
uint32_t stageId(const moveit::task_constructor::Stage* const s);
8+
/// retrieve solution with given id
9+
- const SolutionBase* solutionFromId(uint id) const;
10+
+ const SolutionBase* solutionFromId(uint32_t id) const;
11+
};
12+
} // namespace task_constructor
13+
} // namespace moveit
14+
diff --git a/include/moveit/task_constructor/properties.h b/include/moveit/task_constructor/properties.h
15+
index e217ad6..708a2fb 100644
16+
--- a/include/moveit/task_constructor/properties.h
17+
+++ b/include/moveit/task_constructor/properties.h
18+
@@ -90,7 +90,7 @@ public:
19+
/// exception thrown when trying to set a value not matching the declared type
20+
class type_error;
21+
22+
- using SourceFlags = uint;
23+
+ using SourceFlags = uint32_t;
24+
/// function callback used to initialize property value from another PropertyMap
25+
using InitializerFunction = std::function<boost::any(const PropertyMap&)>;
26+
127
diff --git a/python/bindings/CMakeLists.txt b/python/bindings/CMakeLists.txt
228
index 26c86ac..d5cd670 100644
329
--- a/python/bindings/CMakeLists.txt
@@ -48,6 +74,19 @@ index 9ddb94f..9896d36 100644
4874
}
4975

5076
return distance_to_cost(distance);
77+
diff --git a/src/introspection.cpp b/src/introspection.cpp
78+
index d938f95..85292d9 100644
79+
--- a/src/introspection.cpp
80+
+++ b/src/introspection.cpp
81+
@@ -214,7 +214,7 @@ void Introspection::publishAllSolutions(bool wait) {
82+
};
83+
}
84+
85+
-const SolutionBase* Introspection::solutionFromId(uint id) const {
86+
+const SolutionBase* Introspection::solutionFromId(uint32_t id) const {
87+
auto it = impl->id_solution_bimap_.left.find(id);
88+
if (it == impl->id_solution_bimap_.left.end())
89+
return nullptr;
5190
diff --git a/src/properties.cpp b/src/properties.cpp
5291
index 8c001de..6fd0217 100644
5392
--- a/src/properties.cpp
@@ -60,6 +99,28 @@ index 8c001de..6fd0217 100644
6099
#include <functional>
61100
#include <rclcpp/logging.hpp>
62101
#include <rclcpp/clock.hpp>
102+
diff --git a/src/solvers/pipeline_planner.cpp b/src/solvers/pipeline_planner.cpp
103+
index 9e30131..18e6fb9 100644
104+
--- a/src/solvers/pipeline_planner.cpp
105+
+++ b/src/solvers/pipeline_planner.cpp
106+
@@ -59,7 +59,7 @@ PipelinePlanner::PipelinePlanner(
107+
, stopping_criterion_callback_(stopping_criterion_callback)
108+
, solution_selection_function_(solution_selection_function) {
109+
// Declare properties of the MotionPlanRequest
110+
- properties().declare<uint>("num_planning_attempts", 1u, "number of planning attempts");
111+
+ properties().declare<uint32_t>("num_planning_attempts", 1u, "number of planning attempts");
112+
properties().declare<moveit_msgs::msg::WorkspaceParameters>(
113+
"workspace_parameters", moveit_msgs::msg::WorkspaceParameters(), "allowed workspace of mobile base?");
114+
115+
@@ -182,7 +182,7 @@ PlannerInterface::Result PipelinePlanner::plan(const planning_scene::PlanningSce
116+
request.planner_id = planner_id;
117+
request.allowed_planning_time = timeout;
118+
request.start_state.is_diff = true; // we don't specify an extra start state
119+
- request.num_planning_attempts = properties().get<uint>("num_planning_attempts");
120+
+ request.num_planning_attempts = properties().get<uint32_t>("num_planning_attempts");
121+
request.max_velocity_scaling_factor = properties().get<double>("max_velocity_scaling_factor");
122+
request.max_acceleration_scaling_factor = properties().get<double>("max_acceleration_scaling_factor");
123+
request.workspace_parameters = properties().get<moveit_msgs::msg::WorkspaceParameters>("workspace_parameters");
63124
diff --git a/src/stage.cpp b/src/stage.cpp
64125
index b64ce0a..a9eb8a0 100644
65126
--- a/src/stage.cpp

0 commit comments

Comments
 (0)