From c071d18131a63adcaf6d88891cc9b41cf1b06394 Mon Sep 17 00:00:00 2001 From: Nobuhiro Ban Date: Wed, 5 Jun 2024 21:46:55 +0900 Subject: [PATCH 1/2] add missing include (for FTBFS with gcc-13) --- include/takatori/datetime/interval.h | 2 ++ include/takatori/graph/multiport.h | 1 + include/takatori/serializer/json_printer.h | 1 + include/takatori/value/date.h | 1 + include/takatori/value/datetime_interval.h | 1 + include/takatori/value/time_of_day.h | 1 + include/takatori/value/time_point.h | 1 + 7 files changed, 8 insertions(+) diff --git a/include/takatori/datetime/interval.h b/include/takatori/datetime/interval.h index 2e343ca..d79dcf9 100644 --- a/include/takatori/datetime/interval.h +++ b/include/takatori/datetime/interval.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "date_interval.h" #include "time_interval.h" #include "datetime_interval.h" diff --git a/include/takatori/graph/multiport.h b/include/takatori/graph/multiport.h index a7f947d..6e0d50d 100644 --- a/include/takatori/graph/multiport.h +++ b/include/takatori/graph/multiport.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include diff --git a/include/takatori/serializer/json_printer.h b/include/takatori/serializer/json_printer.h index d7849d5..b68456f 100644 --- a/include/takatori/serializer/json_printer.h +++ b/include/takatori/serializer/json_printer.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include diff --git a/include/takatori/value/date.h b/include/takatori/value/date.h index 0c4fb8f..1f6bfe7 100644 --- a/include/takatori/value/date.h +++ b/include/takatori/value/date.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include "value_kind.h" diff --git a/include/takatori/value/datetime_interval.h b/include/takatori/value/datetime_interval.h index 53835de..070e54a 100644 --- a/include/takatori/value/datetime_interval.h +++ b/include/takatori/value/datetime_interval.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include "value_kind.h" diff --git a/include/takatori/value/time_of_day.h b/include/takatori/value/time_of_day.h index 9da431f..b7c50b5 100644 --- a/include/takatori/value/time_of_day.h +++ b/include/takatori/value/time_of_day.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include "value_kind.h" diff --git a/include/takatori/value/time_point.h b/include/takatori/value/time_point.h index 84a325c..9348174 100644 --- a/include/takatori/value/time_point.h +++ b/include/takatori/value/time_point.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include "value_kind.h" From 8b50b61022ee7f7d578bf889ca2c8b429ad206d0 Mon Sep 17 00:00:00 2001 From: Nobuhiro Ban Date: Wed, 5 Jun 2024 21:52:54 +0900 Subject: [PATCH 2/2] explicitly discarding return value of std::string::data() (for FTBFS with gcc-13) --- test/takatori/util/optional_ptr_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/takatori/util/optional_ptr_test.cpp b/test/takatori/util/optional_ptr_test.cpp index eb7e155..ceec460 100644 --- a/test/takatori/util/optional_ptr_test.cpp +++ b/test/takatori/util/optional_ptr_test.cpp @@ -93,7 +93,7 @@ TEST_F(optional_reference_test, empty) { optional_ptr ref; ASSERT_FALSE(ref); EXPECT_THROW(*ref, std::bad_optional_access); - EXPECT_THROW(ref->data(), std::bad_optional_access); + EXPECT_THROW((void) ref->data(), std::bad_optional_access); EXPECT_EQ(ref.begin(), ref.end()); } @@ -102,7 +102,7 @@ TEST_F(optional_reference_test, nullptr) { optional_ptr ref {ptr }; ASSERT_FALSE(ref); EXPECT_THROW(*ref, std::bad_optional_access); - EXPECT_THROW(ref->data(), std::bad_optional_access); + EXPECT_THROW((void) ref->data(), std::bad_optional_access); EXPECT_EQ(ref.begin(), ref.end()); }