From b9c8ffce5b9a5a4b2d98458eeff464579e753b12 Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Fri, 23 Jun 2023 12:00:08 +0200 Subject: [PATCH] node-iec60870: ignore -Wmaybe-uninitialized false positive Signed-off-by: Philipp Jungkamp --- lib/nodes/iec60870.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/nodes/iec60870.cpp b/lib/nodes/iec60870.cpp index d3683bb76..09b2461d4 100644 --- a/lib/nodes/iec60870.cpp +++ b/lib/nodes/iec60870.cpp @@ -256,8 +256,11 @@ std::optional ASDUData::checkASDU(CS101_ASDU const &asdu) cons bool ASDUData::addSampleToASDU(CS101_ASDU &asdu, ASDUData::Sample sample) const { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + std::optional timestamp = sample.timestamp.has_value() - ? std::optional { timespec_to_cp56time2a(sample.timestamp.value()) } + ? std::optional { timespec_to_cp56time2a(*sample.timestamp) } : std::nullopt; InformationObject io = nullptr; @@ -341,6 +344,7 @@ bool ASDUData::addSampleToASDU(CS101_ASDU &asdu, ASDUData::Sample sample) const InformationObject_destroy(io); return successfully_added; +#pragma GCC diagnostic pop } ASDUData::ASDUData(ASDUData::Descriptor const *descriptor, int ioa, int ioa_sequence_start) : ioa(ioa), ioa_sequence_start(ioa_sequence_start), descriptor(descriptor)