refactor(autoware_lanelet2_utils): rewrite using modern C++ without API breakage (#347)

youtalk · web-flow · commit db46198f4f7c · 2025-04-01T16:50:04.000+09:00
* refactor using modern c++ Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp> * precommit Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp> * fix Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp> * fix Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp> * precommit Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp> * use std::strcmp Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp> * precommit Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp> * Revert "refactor using modern c++" This reverts commit 3f7e495. --------- Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
diff --git a/common/autoware_lanelet2_utils/src/intersection.cpp b/common/autoware_lanelet2_utils/src/intersection.cpp
@@ -16,6 +16,7 @@
 
 #include <lanelet2_core/primitives/Lanelet.h>
 
+#include <cstring>
 namespace autoware::lanelet2_utils
 {
 
@@ -26,17 +27,17 @@ bool is_intersection_lanelet(const lanelet::ConstLanelet & lanelet)
 
 bool is_straight_direction(const lanelet::ConstLanelet & lanelet)
 {
-  return strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_straight) == 0;
+  return std::strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_straight) == 0;
 }
 
 bool is_left_direction(const lanelet::ConstLanelet & lanelet)
 {
-  return strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_left) == 0;
+  return std::strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_left) == 0;
 }
 
 bool is_right_direction(const lanelet::ConstLanelet & lanelet)
 {
-  return strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_right) == 0;
+  return std::strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_right) == 0;
 }
 
 std::optional<TurnDirection> get_turn_direction(const lanelet::ConstLanelet & lanelet)
diff --git a/common/autoware_lanelet2_utils/src/kind.cpp b/common/autoware_lanelet2_utils/src/kind.cpp
@@ -16,23 +16,24 @@
 
 #include <lanelet2_core/primitives/Lanelet.h>
 
+#include <cstring>
 namespace autoware::lanelet2_utils
 {
 bool is_road_lane(const lanelet::ConstLanelet & lanelet)
 {
-  return strcmp(lanelet.attributeOr(lanelet::AttributeName::Subtype, "none"), k_road_lane_type) ==
-         0;
+  return std::strcmp(
+           lanelet.attributeOr(lanelet::AttributeName::Subtype, "none"), k_road_lane_type) == 0;
 }
 
 bool is_shoulder_lane(const lanelet::ConstLanelet & lanelet)
 {
-  return strcmp(
+  return std::strcmp(
            lanelet.attributeOr(lanelet::AttributeName::Subtype, "none"), k_shoulder_lane_type) == 0;
 }
 
 bool is_bicycle_lane(const lanelet::ConstLanelet & lanelet)
 {
-  return strcmp(
+  return std::strcmp(
            lanelet.attributeOr(lanelet::AttributeName::Subtype, "none"), k_bicycle_lane_type) == 0;
 }
 }  // namespace autoware::lanelet2_utils

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`#include <lanelet2_core/primitives/Lanelet.h>`
`18`	`18`
	`19`	`+#include <cstring>`
`19`	`20`	`namespace autoware::lanelet2_utils`
`20`	`21`	`{`
`21`	`22`
`@@ -26,17 +27,17 @@ bool is_intersection_lanelet(const lanelet::ConstLanelet & lanelet)`
`26`	`27`
`27`	`28`	`bool is_straight_direction(const lanelet::ConstLanelet & lanelet)`
`28`	`29`	`{`
`29`		`- return strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_straight) == 0;`
	`30`	`+ return std::strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_straight) == 0;`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`bool is_left_direction(const lanelet::ConstLanelet & lanelet)`
`33`	`34`	`{`
`34`		`- return strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_left) == 0;`
	`35`	`+ return std::strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_left) == 0;`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`bool is_right_direction(const lanelet::ConstLanelet & lanelet)`
`38`	`39`	`{`
`39`		`- return strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_right) == 0;`
	`40`	`+ return std::strcmp(lanelet.attributeOr(k_turn_direction, "else"), k_turn_direction_right) == 0;`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`std::optional<TurnDirection> get_turn_direction(const lanelet::ConstLanelet & lanelet)`
Original file line number	Diff line number	Diff line change
`@@ -16,23 +16,24 @@`
`16`	`16`
`17`	`17`	`#include <lanelet2_core/primitives/Lanelet.h>`
`18`	`18`
	`19`	`+#include <cstring>`
`19`	`20`	`namespace autoware::lanelet2_utils`
`20`	`21`	`{`
`21`	`22`	`bool is_road_lane(const lanelet::ConstLanelet & lanelet)`
`22`	`23`	`{`
`23`		`- return strcmp(lanelet.attributeOr(lanelet::AttributeName::Subtype, "none"), k_road_lane_type) ==`
`24`		`- 0;`
	`24`	`+ return std::strcmp(`
	`25`	`+ lanelet.attributeOr(lanelet::AttributeName::Subtype, "none"), k_road_lane_type) == 0;`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`bool is_shoulder_lane(const lanelet::ConstLanelet & lanelet)`
`28`	`29`	`{`
`29`		`- return strcmp(`
	`30`	`+ return std::strcmp(`
`30`	`31`	`lanelet.attributeOr(lanelet::AttributeName::Subtype, "none"), k_shoulder_lane_type) == 0;`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`bool is_bicycle_lane(const lanelet::ConstLanelet & lanelet)`
`34`	`35`	`{`
`35`		`- return strcmp(`
	`36`	`+ return std::strcmp(`
`36`	`37`	`lanelet.attributeOr(lanelet::AttributeName::Subtype, "none"), k_bicycle_lane_type) == 0;`
`37`	`38`	`}`
`38`	`39`	`} // namespace autoware::lanelet2_utils`