Skip to content

Commit b5848b0

Browse files
committedNov 15, 2024
In eez-flow.h, fix compile error on GCC when "-Wdangling-pointer=1" is enabled
1 parent 5f4a0ea commit b5848b0

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed
 

‎resources/eez-framework-amalgamation/eez-flow.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Autogenerated on November 7, 2024 10:25:35 AM from eez-framework commit 129db029d6fc4fdd1086fc8f836d72feed469d54 */
1+
/* Autogenerated on November 15, 2024 4:22:16 PM from eez-framework commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 */
22
/*
33
* eez-framework
44
*

‎resources/eez-framework-amalgamation/eez-flow.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Autogenerated on November 7, 2024 10:25:35 AM from eez-framework commit 129db029d6fc4fdd1086fc8f836d72feed469d54 */
1+
/* Autogenerated on November 15, 2024 4:22:16 PM from eez-framework commit 83b926fbd2f39af0eb6460b1cc38e289a5dd6432 */
22
/*
33
* eez-framework
44
*
@@ -1040,12 +1040,22 @@ struct Value {
10401040
type = VALUE_TYPE_STRING;
10411041
unit = 0;
10421042
options = 0;
1043+
#pragma GCC diagnostic push
1044+
#if !defined(__has_warning) || __has_warning("-Wdangling-pointer")
1045+
#pragma GCC diagnostic ignored "-Wdangling-pointer=1"
1046+
#endif
10431047
strValue = (const char *)((uint8_t *)&value.int32Value + value.int32Value);
1048+
#pragma GCC diagnostic pop
10441049
} else if (value.type == VALUE_TYPE_ARRAY_ASSET) {
10451050
type = VALUE_TYPE_ARRAY;
10461051
unit = 0;
10471052
options = 0;
1053+
#pragma GCC diagnostic push
1054+
#if !defined(__has_warning) || __has_warning("-Wdangling-pointer")
1055+
#pragma GCC diagnostic ignored "-Wdangling-pointer=1"
1056+
#endif
10481057
arrayValue = (ArrayValue *)((uint8_t *)&value.int32Value + value.int32Value);
1058+
#pragma GCC diagnostic pop
10491059
} else {
10501060
type = value.type;
10511061
unit = value.unit;

0 commit comments

Comments
 (0)