Skip to content

Commit

Permalink
update eez-framework
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Nov 16, 2024
1 parent b5848b0 commit 3309f36
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 11 deletions.
2 changes: 1 addition & 1 deletion packages/project-editor/flow/runtime/cpp/eez-framework
2 changes: 1 addition & 1 deletion resources/eez-framework-amalgamation/eez-flow.cpp
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
30 changes: 21 additions & 9 deletions resources/eez-framework-amalgamation/eez-flow.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 3309f36

Please sign in to comment.