From b5848b0ef936f332b55cc30646a56a92e48ab924 Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Fri, 15 Nov 2024 16:25:23 +0100 Subject: [PATCH] In eez-flow.h, fix compile error on GCC when "-Wdangling-pointer=1" is enabled --- .../project-editor/flow/runtime/cpp/eez-framework | 2 +- resources/eez-framework-amalgamation/eez-flow.cpp | 2 +- resources/eez-framework-amalgamation/eez-flow.h | 12 +++++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework index 83b926fbd..7a01ce78c 160000 --- a/packages/project-editor/flow/runtime/cpp/eez-framework +++ b/packages/project-editor/flow/runtime/cpp/eez-framework @@ -1 +1 @@ -Subproject commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 +Subproject commit 7a01ce78cb06c38d668e4873296b5652ec55b43f diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index 0f5fc37f1..0c2e4256d 100644 --- a/resources/eez-framework-amalgamation/eez-flow.cpp +++ b/resources/eez-framework-amalgamation/eez-flow.cpp @@ -1,4 +1,4 @@ -/* Autogenerated on November 7, 2024 10:25:35 AM from eez-framework commit 129db029d6fc4fdd1086fc8f836d72feed469d54 */ +/* Autogenerated on November 15, 2024 4:22:16 PM from eez-framework commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 */ /* * eez-framework * diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h index fd0c42488..f24e68f7c 100644 --- a/resources/eez-framework-amalgamation/eez-flow.h +++ b/resources/eez-framework-amalgamation/eez-flow.h @@ -1,4 +1,4 @@ -/* Autogenerated on November 7, 2024 10:25:35 AM from eez-framework commit 129db029d6fc4fdd1086fc8f836d72feed469d54 */ +/* Autogenerated on November 15, 2024 4:22:16 PM from eez-framework commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 */ /* * eez-framework * @@ -1040,12 +1040,22 @@ struct Value { type = VALUE_TYPE_STRING; unit = 0; options = 0; +#pragma GCC diagnostic push +#if !defined(__has_warning) || __has_warning("-Wdangling-pointer") +#pragma GCC diagnostic ignored "-Wdangling-pointer=1" +#endif strValue = (const char *)((uint8_t *)&value.int32Value + value.int32Value); +#pragma GCC diagnostic pop } else if (value.type == VALUE_TYPE_ARRAY_ASSET) { type = VALUE_TYPE_ARRAY; unit = 0; options = 0; +#pragma GCC diagnostic push +#if !defined(__has_warning) || __has_warning("-Wdangling-pointer") +#pragma GCC diagnostic ignored "-Wdangling-pointer=1" +#endif arrayValue = (ArrayValue *)((uint8_t *)&value.int32Value + value.int32Value); +#pragma GCC diagnostic pop } else { type = value.type; unit = value.unit;