File tree 4 files changed +7
-7
lines changed
4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -101,12 +101,12 @@ The macro in the first example above produces a structure like this::
101
101
constexpr const struct {
102
102
ObjectBase object;
103
103
MapPair<int, String> data[2];
104
- } fstr_data_intmap PROGMEM = {
104
+ } __fstr__intmap PROGMEM = {
105
105
{16},
106
106
{35, &content1},
107
107
{180, &content2},
108
108
};
109
- const Map<int, String>& intmap = fstr_data_intmap .object.as<Map<int, String>>();
109
+ const Map<int, String>& intmap = __fstr__intmap .object.as<Map<int, String>>();
110
110
111
111
Note: ``FSTR:: `` namespace qualifier omitted for clarity.
112
112
Original file line number Diff line number Diff line change 46
46
/* *
47
47
* @brief Provide internal name for generated flash string structures
48
48
*/
49
- #define FSTR_DATA_NAME (name ) fstr_data_ ##name
49
+ #define FSTR_DATA_NAME (name ) __fstr__ ##name
50
50
51
51
/* *
52
52
* @brief Given an Object& reference, return a pointer to the actual object
Original file line number Diff line number Diff line change @@ -42,8 +42,8 @@ typedef const __FlashStringHelper* flash_string_t;
42
42
*/
43
43
#define FS_PTR (str ) \
44
44
(__extension__({ \
45
- static DEFINE_FSTR_DATA (struc , str); \
46
- static_cast <const FSTR::String*>(&struc .object ); \
45
+ static DEFINE_FSTR_DATA (__fstr__ , str); \
46
+ static_cast <const FSTR::String*>(&__fstr__ .object ); \
47
47
}))
48
48
49
49
/* *
Original file line number Diff line number Diff line change @@ -70,14 +70,14 @@ The above example generates a structure like this::
70
70
const struct {
71
71
ObjectBase object;
72
72
String* entries[4];
73
- } fstr_data_myTable PROGMEM = {
73
+ } __fstr__myTable PROGMEM = {
74
74
{16},
75
75
&str1,
76
76
&str2,
77
77
nullptr,
78
78
&str3,
79
79
};
80
- const Vector<String>& myTable PROGMEM = fstr_data_myTable .as<Vector<String>>();
80
+ const Vector<String>& myTable PROGMEM = __fstr__myTable .as<Vector<String>>();
81
81
82
82
Note: ``FSTR:: `` namespace qualifier omitted for clarity.
83
83
You can’t perform that action at this time.
0 commit comments