|
1 | | -From de154c421fe311efefef80d3c14d1dc47c17b15e Mon Sep 17 00:00:00 2001 |
| 1 | +From bcca437c62737b7d8198484540f6c9a4e1eaafd4 Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Esteve Fernandez <esteve.fernandez@bonsairobotics.ai> |
3 | | -Date: Mon, 11 May 2026 11:15:34 +0100 |
4 | | -Subject: [PATCH] fix(autoware_trajectory): migrate tl_expected dependency to |
5 | | - rcpputils |
| 3 | +Date: Mon, 11 May 2026 14:35:28 +0100 |
| 4 | +Subject: [PATCH] fix(ouster_ros): use brace init for major/minor to avoid sysmacros.h collision |
6 | 5 |
|
7 | 6 | Signed-off-by: Esteve Fernandez <esteve.fernandez@bonsairobotics.ai> |
8 | 7 | --- |
9 | | - include/autoware/trajectory/interpolator/result.hpp | 2 +- |
10 | | - include/autoware/trajectory/temporal_trajectory.hpp | 2 +- |
11 | | - include/autoware/trajectory/utils/reference_path.hpp | 2 +- |
12 | | - include/autoware/trajectory/utils/shift.hpp | 2 +- |
13 | | - package.xml | 2 +- |
14 | | - 5 files changed, 5 insertions(+), 5 deletions(-) |
| 8 | + ouster-sdk/ouster_client/include/ouster/version.h | 2 +- |
| 9 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 10 |
|
16 | | -diff --git a/include/autoware/trajectory/interpolator/result.hpp b/include/autoware/trajectory/interpolator/result.hpp |
17 | | -index 5ea32574..f06b16e6 100644 |
18 | | ---- a/include/autoware/trajectory/interpolator/result.hpp |
19 | | -+++ b/include/autoware/trajectory/interpolator/result.hpp |
20 | | -@@ -15,7 +15,7 @@ |
21 | | - #ifndef AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_ |
22 | | - #define AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_ |
23 | | - |
24 | | --#include <tl_expected/expected.hpp> |
25 | | -+#include <rcpputils/tl_expected/expected.hpp> |
26 | | - |
27 | | - #include <string> |
28 | | - |
29 | | -diff --git a/include/autoware/trajectory/temporal_trajectory.hpp b/include/autoware/trajectory/temporal_trajectory.hpp |
30 | | -index 443d407a..4fe6b2a4 100644 |
31 | | ---- a/include/autoware/trajectory/temporal_trajectory.hpp |
32 | | -+++ b/include/autoware/trajectory/temporal_trajectory.hpp |
33 | | -@@ -18,7 +18,7 @@ |
34 | | - #include "autoware/trajectory/detail/time_distance_mapping.hpp" |
35 | | - #include "autoware/trajectory/trajectory_point.hpp" |
36 | | - |
37 | | --#include <tl_expected/expected.hpp> |
38 | | -+#include <rcpputils/tl_expected/expected.hpp> |
39 | | - |
40 | | - #include <memory> |
41 | | - #include <utility> |
42 | | -diff --git a/include/autoware/trajectory/utils/reference_path.hpp b/include/autoware/trajectory/utils/reference_path.hpp |
43 | | -index df92ef97..bf52e8cc 100644 |
44 | | ---- a/include/autoware/trajectory/utils/reference_path.hpp |
45 | | -+++ b/include/autoware/trajectory/utils/reference_path.hpp |
46 | | -@@ -17,7 +17,7 @@ |
47 | | - |
48 | | - #include "autoware/trajectory/forward.hpp" |
49 | | - |
50 | | --#include <tl_expected/expected.hpp> |
51 | | -+#include <rcpputils/tl_expected/expected.hpp> |
52 | | - |
53 | | - #include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp> |
54 | | - |
55 | | -diff --git a/include/autoware/trajectory/utils/shift.hpp b/include/autoware/trajectory/utils/shift.hpp |
56 | | -index 552cbed6..1c640494 100644 |
57 | | ---- a/include/autoware/trajectory/utils/shift.hpp |
58 | | -+++ b/include/autoware/trajectory/utils/shift.hpp |
59 | | -@@ -19,7 +19,7 @@ |
60 | | - #include "autoware/trajectory/forward.hpp" |
61 | | - |
62 | | - #include <range/v3/view/zip.hpp> |
63 | | --#include <tl_expected/expected.hpp> |
64 | | -+#include <rcpputils/tl_expected/expected.hpp> |
65 | | - |
66 | | - #include <string> |
67 | | - #include <utility> |
68 | | -diff --git a/package.xml b/package.xml |
69 | | -index b49e2953..a9a68a01 100644 |
70 | | ---- a/package.xml |
71 | | -+++ b/package.xml |
72 | | -@@ -31,7 +31,7 @@ |
73 | | - <depend>rclcpp</depend> |
74 | | - <depend>tf2</depend> |
75 | | - <depend>tf2_geometry_msgs</depend> |
76 | | -- <depend>tl_expected</depend> |
77 | | -+ <depend>rcpputils</depend> |
78 | | - |
79 | | - <test_depend>ament_cmake_auto</test_depend> |
80 | | - <test_depend>ament_index_cpp</test_depend> |
| 11 | +diff --git a/ouster-sdk/ouster_client/include/ouster/version.h b/ouster-sdk/ouster_client/include/ouster/version.h |
| 12 | +index 7867e3a..ef4539f 100644 |
| 13 | +--- a/ouster-sdk/ouster_client/include/ouster/version.h |
| 14 | ++++ b/ouster-sdk/ouster_client/include/ouster/version.h |
| 15 | +@@ -44,7 +44,7 @@ struct OUSTER_API_CLASS Version { |
| 16 | + * @param[in] pat Patch version number. |
| 17 | + */ |
| 18 | + OUSTER_API_FUNCTION Version(uint16_t maj, uint16_t min, uint16_t pat) |
| 19 | +- : major(maj), minor(min), patch(pat) {} |
| 20 | ++ : major{maj}, minor{min}, patch{pat} {} |
| 21 | + |
| 22 | + /** |
| 23 | + * Return the version as a string formatted as |
81 | 24 | -- |
82 | 25 | 2.54.0 |
83 | 26 |
|
0 commit comments