fix: fix Boost.Optional build error on Jazzy (#7602)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Kotaro Yoshimoto <[email protected]>
autowarefoundation · Oct 10, 2024 · 1746798 · 1746798
1 parent 2ab8f88
commit 1746798
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/common/autoware_signal_processing/test/src/lowpass_filter_1d_test.cpp b/common/autoware_signal_processing/test/src/lowpass_filter_1d_test.cpp
@@ -14,6 +14,8 @@
 
 #include "autoware/signal_processing/lowpass_filter_1d.hpp"
 
+#include <boost/optional/optional_io.hpp>
+
 #include <gtest/gtest.h>
 
 constexpr double epsilon = 1e-6;
@@ -25,7 +27,7 @@ TEST(lowpass_filter_1d, filter)
   LowpassFilter1d lowpass_filter_1d(0.1);
 
   // initial state
-  EXPECT_EQ(lowpass_filter_1d.getValue(), boost::none);
+  EXPECT_FALSE(lowpass_filter_1d.getValue());
 
   // random filter
   EXPECT_NEAR(lowpass_filter_1d.filter(0.0), 0.0, epsilon);
@@ -35,7 +37,7 @@ TEST(lowpass_filter_1d, filter)
 
   // reset without value
   lowpass_filter_1d.reset();
-  EXPECT_EQ(lowpass_filter_1d.getValue(), boost::none);
+  EXPECT_FALSE(lowpass_filter_1d.getValue());
 
   // reset with value
   lowpass_filter_1d.reset(-1.1);

diff --git a/common/autoware_signal_processing/test/src/lowpass_filter_test.cpp b/common/autoware_signal_processing/test/src/lowpass_filter_test.cpp
@@ -14,6 +14,8 @@
 
 #include "autoware/signal_processing/lowpass_filter.hpp"
 
+#include <boost/optional/optional_io.hpp>
+
 #include <gtest/gtest.h>
 
 constexpr double epsilon = 1e-6;
@@ -41,7 +43,7 @@ TEST(lowpass_filter_twist, filter)
   LowpassFilterTwist lowpass_filter_(0.1);
 
   {  // initial state
-    EXPECT_EQ(lowpass_filter_.getValue(), boost::none);
+    EXPECT_FALSE(lowpass_filter_.getValue());
   }
 
   {  // random filter
@@ -58,7 +60,7 @@ TEST(lowpass_filter_twist, filter)
 
   {  // reset without value
     lowpass_filter_.reset();
-    EXPECT_EQ(lowpass_filter_.getValue(), boost::none);
+    EXPECT_FALSE(lowpass_filter_.getValue());
   }
 
   {  // reset with value

diff --git a/common/object_recognition_utils/test/src/test_predicted_path_utils.cpp b/common/object_recognition_utils/test/src/test_predicted_path_utils.cpp
@@ -16,6 +16,8 @@
 #include "autoware/universe_utils/math/unit_conversion.hpp"
 #include "object_recognition_utils/predicted_path_utils.hpp"
 
+#include <boost/optional/optional_io.hpp>
+
 #include <gtest/gtest.h>
 
 using autoware::universe_utils::Point2d;
@@ -75,7 +77,7 @@ TEST(predicted_path_utils, testCalcInterpolatedPose)
     for (double t = 0.0; t < 9.0 + 1e-6; t += 1.0) {
       const auto p = calcInterpolatedPose(path, t);
 
-      EXPECT_NE(p, boost::none);
+      EXPECT_TRUE(p);
       EXPECT_NEAR(p->position.x, t * 1.0, epsilon);
       EXPECT_NEAR(p->position.y, 0.0, epsilon);
       EXPECT_NEAR(p->position.z, 0.0, epsilon);
@@ -92,7 +94,7 @@ TEST(predicted_path_utils, testCalcInterpolatedPose)
     for (double t = 0.0; t < 9.0; t += 0.3) {
       const auto p = calcInterpolatedPose(path, t);
 
-      EXPECT_NE(p, boost::none);
+      EXPECT_TRUE(p);
       EXPECT_NEAR(p->position.x, t * 1.0, epsilon);
       EXPECT_NEAR(p->position.y, 0.0, epsilon);
       EXPECT_NEAR(p->position.z, 0.0, epsilon);
@@ -108,20 +110,20 @@ TEST(predicted_path_utils, testCalcInterpolatedPose)
     // Negative time
     {
       const auto p = calcInterpolatedPose(path, -1.0);
-      EXPECT_EQ(p, boost::none);
+      EXPECT_FALSE(p);
     }
 
     // Over the time horizon
     {
       const auto p = calcInterpolatedPose(path, 11.0);
-      EXPECT_EQ(p, boost::none);
+      EXPECT_FALSE(p);
     }
 
     // Empty Path
     {
       PredictedPath empty_path;
       const auto p = calcInterpolatedPose(empty_path, 5.0);
-      EXPECT_EQ(p, boost::none);
+      EXPECT_FALSE(p);
     }
   }
 }