From 3309f36c43d2ebbabfa5f2caee53b52588620ac8 Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Sat, 16 Nov 2024 16:58:54 +0100 Subject: [PATCH] update eez-framework --- .../flow/runtime/cpp/eez-framework | 2 +- .../eez-framework-amalgamation/eez-flow.cpp | 2 +- .../eez-framework-amalgamation/eez-flow.h | 30 +++++++++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/packages/project-editor/flow/runtime/cpp/eez-framework b/packages/project-editor/flow/runtime/cpp/eez-framework index 7a01ce78..3dee6f40 160000 --- a/packages/project-editor/flow/runtime/cpp/eez-framework +++ b/packages/project-editor/flow/runtime/cpp/eez-framework @@ -1 +1 @@ -Subproject commit 7a01ce78cb06c38d668e4873296b5652ec55b43f +Subproject commit 3dee6f40927c74568901c8c97f3e16b4ecbb6051 diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index 0c2e4256..a7838c84 100644 --- a/resources/eez-framework-amalgamation/eez-flow.cpp +++ b/resources/eez-framework-amalgamation/eez-flow.cpp @@ -1,4 +1,4 @@ -/* Autogenerated on November 15, 2024 4:22:16 PM from eez-framework commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 */ +/* Autogenerated on November 16, 2024 4:57:49 PM from eez-framework commit 7a01ce78cb06c38d668e4873296b5652ec55b43f */ /* * eez-framework * diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h index f24e68f7..c595414e 100644 --- a/resources/eez-framework-amalgamation/eez-flow.h +++ b/resources/eez-framework-amalgamation/eez-flow.h @@ -1,4 +1,4 @@ -/* Autogenerated on November 15, 2024 4:22:16 PM from eez-framework commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 */ +/* Autogenerated on November 16, 2024 4:57:49 PM from eez-framework commit 7a01ce78cb06c38d668e4873296b5652ec55b43f */ /* * eez-framework * @@ -1040,22 +1040,34 @@ 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" +#if __GNUC__ && defined( __has_warning ) +# if __has_warning( "-Wdangling-pointer" ) +# define SUPPRESSING +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdangling-pointer" +# endif #endif strValue = (const char *)((uint8_t *)&value.int32Value + value.int32Value); -#pragma GCC diagnostic pop +#ifdef SUPPRESSING +# undef SUPPRESSING +# pragma GCC diagnostic pop +#endif } 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" +#if __GNUC__ && defined( __has_warning ) +# if __has_warning( "-Wdangling-pointer" ) +# define SUPPRESSING +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdangling-pointer" +# endif #endif arrayValue = (ArrayValue *)((uint8_t *)&value.int32Value + value.int32Value); -#pragma GCC diagnostic pop +#ifdef SUPPRESSING +# undef SUPPRESSING +# pragma GCC diagnostic pop +#endif } else { type = value.type; unit = value.unit;