|
1 | | -diff --git a/common/autoware_trajectory/CMakeLists.txt b/common/autoware_trajectory/CMakeLists.txt |
2 | | -index 4c3275d32a..4aae06a991 100644 |
3 | | ---- a/common/autoware_trajectory/CMakeLists.txt |
4 | | -+++ b/common/autoware_trajectory/CMakeLists.txt |
5 | | -@@ -44,6 +44,7 @@ ament_auto_add_library(autoware_trajectory SHARED |
6 | | - src/utils/footprint.cpp |
7 | | - src/utils/velocity.cpp |
8 | | - ) |
9 | | -+target_link_libraries(autoware_trajectory fmt::fmt) |
10 | | - |
11 | | - if(BUILD_TESTING) |
12 | | - ament_auto_find_test_dependencies() |
13 | | -diff --git a/common/autoware_trajectory/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp b/common/autoware_trajectory/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp |
14 | | -index e339508816..c010fa633a 100644 |
15 | | ---- a/common/autoware_trajectory/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp |
16 | | -+++ b/common/autoware_trajectory/include/autoware/trajectory/interpolator/detail/interpolator_common_interface.hpp |
17 | | -@@ -19,6 +19,7 @@ |
18 | | - |
19 | | - #include <rclcpp/logging.hpp> |
20 | | - |
21 | | -+#include <algorithm> |
| 1 | +From c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d Mon Sep 17 00:00:00 2001 |
| 2 | +From: Esteve Fernandez <esteve.fernandez@bonsairobotics.ai> |
| 3 | +Date: Mon, 11 May 2026 14:24:03 +0100 |
| 4 | +Subject: [PATCH] fix(autoware_trajectory): migrate tl_expected to libexpected-dev |
| 5 | + |
| 6 | +Signed-off-by: Esteve Fernandez <esteve.fernandez@bonsairobotics.ai> |
| 7 | +--- |
| 8 | + include/autoware/trajectory/interpolator/result.hpp | 2 +- |
| 9 | + include/autoware/trajectory/temporal_trajectory.hpp | 2 +- |
| 10 | + include/autoware/trajectory/utils/reference_path.hpp | 2 +- |
| 11 | + include/autoware/trajectory/utils/shift.hpp | 2 +- |
| 12 | + package.xml | 2 +- |
| 13 | + 5 files changed, 5 insertions(+), 5 deletions(-) |
| 14 | + |
| 15 | +diff --git a/include/autoware/trajectory/interpolator/result.hpp b/include/autoware/trajectory/interpolator/result.hpp |
| 16 | +index 5ea3257..f06b16e 100644 |
| 17 | +--- a/include/autoware/trajectory/interpolator/result.hpp |
| 18 | ++++ b/include/autoware/trajectory/interpolator/result.hpp |
| 19 | +@@ -15,7 +15,7 @@ |
| 20 | + #ifndef AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_ |
| 21 | + #define AUTOWARE__TRAJECTORY__INTERPOLATOR__RESULT_HPP_ |
| 22 | + |
| 23 | +-#include <tl_expected/expected.hpp> |
| 24 | ++#include <tl/expected.hpp> |
| 25 | + |
| 26 | + #include <string> |
| 27 | + |
| 28 | +diff --git a/include/autoware/trajectory/temporal_trajectory.hpp b/include/autoware/trajectory/temporal_trajectory.hpp |
| 29 | +index 443d407..4fe6b2a 100644 |
| 30 | +--- a/include/autoware/trajectory/temporal_trajectory.hpp |
| 31 | ++++ b/include/autoware/trajectory/temporal_trajectory.hpp |
| 32 | +@@ -18,7 +18,7 @@ |
| 33 | + #include "autoware/trajectory/detail/time_distance_mapping.hpp" |
| 34 | + #include "autoware/trajectory/trajectory_point.hpp" |
| 35 | + |
| 36 | +-#include <tl_expected/expected.hpp> |
| 37 | ++#include <tl/expected.hpp> |
| 38 | + |
| 39 | + #include <memory> |
| 40 | + #include <utility> |
| 41 | +diff --git a/include/autoware/trajectory/utils/reference_path.hpp b/include/autoware/trajectory/utils/reference_path.hpp |
| 42 | +index df92ef9..bf52e8c 100644 |
| 43 | +--- a/include/autoware/trajectory/utils/reference_path.hpp |
| 44 | ++++ b/include/autoware/trajectory/utils/reference_path.hpp |
| 45 | +@@ -17,7 +17,7 @@ |
| 46 | + |
| 47 | + #include "autoware/trajectory/forward.hpp" |
| 48 | + |
| 49 | +-#include <tl_expected/expected.hpp> |
| 50 | ++#include <tl/expected.hpp> |
| 51 | + |
| 52 | + #include <autoware_internal_planning_msgs/msg/path_with_lane_id.hpp> |
| 53 | + |
| 54 | +diff --git a/include/autoware/trajectory/utils/shift.hpp b/include/autoware/trajectory/utils/shift.hpp |
| 55 | +index 552cbed..1c64049 100644 |
| 56 | +--- a/include/autoware/trajectory/utils/shift.hpp |
| 57 | ++++ b/include/autoware/trajectory/utils/shift.hpp |
| 58 | +@@ -19,7 +19,7 @@ |
| 59 | + #include "autoware/trajectory/forward.hpp" |
| 60 | + |
| 61 | + #include <range/v3/view/zip.hpp> |
| 62 | +-#include <tl_expected/expected.hpp> |
| 63 | ++#include <tl/expected.hpp> |
| 64 | + |
| 65 | + #include <string> |
22 | 66 | #include <utility> |
23 | | - #include <vector> |
| 67 | +diff --git a/package.xml b/package.xml |
| 68 | +index b49e295..c5f5a10 100644 |
| 69 | +--- a/package.xml |
| 70 | ++++ b/package.xml |
| 71 | +@@ -28,11 +28,11 @@ |
| 72 | + <depend>fmt</depend> |
| 73 | + <depend>geometry_msgs</depend> |
| 74 | + <depend>lanelet2_core</depend> |
| 75 | ++ <depend>libexpected-dev</depend> |
| 76 | + <depend>rclcpp</depend> |
| 77 | + <depend>tf2</depend> |
| 78 | + <depend>tf2_geometry_msgs</depend> |
| 79 | +- <depend>tl_expected</depend> |
24 | 80 |
|
| 81 | + <test_depend>ament_cmake_auto</test_depend> |
| 82 | + <test_depend>ament_index_cpp</test_depend> |
| 83 | +-- |
| 84 | +2.54.0 |
| 85 | + |
0 commit comments