File tree Expand file tree Collapse file tree 2 files changed +19
-0
lines changed
arduino-json-5.2/include/ArduinoJson/Arduino Expand file tree Collapse file tree 2 files changed +19
-0
lines changed Original file line number Diff line number Diff line change 9
9
10
10
#ifndef ARDUINO
11
11
12
+ #ifndef ARDUINO_STRING_OVERRIDE
13
+ #define ARDUINO_STRING_OVERRIDE
12
14
#include < string>
13
15
typedef std::string String;
16
+ #endif
14
17
15
18
#else
16
19
Original file line number Diff line number Diff line change
1
+ diff --git a/src/third-party/arduino-json-5.2/include/ArduinoJson/Arduino/String.hpp b/src/third-party/arduino-json-5.2/include/ArduinoJson/Arduino/String.hpp
2
+ index a11a651..83cf650 100644
3
+ --- a/src/third-party/arduino-json-5.2/include/ArduinoJson/Arduino/String.hpp
4
+ +++ b/src/third-party/arduino-json-5.2/include/ArduinoJson/Arduino/String.hpp
5
+ @@ -9,8 +9,11 @@
6
+
7
+ #ifndef ARDUINO
8
+
9
+ + #ifndef ARDUINO_STRING_OVERRIDE
10
+ + #define ARDUINO_STRING_OVERRIDE
11
+ #include <string>
12
+ typedef std::string String;
13
+ + #endif
14
+
15
+ #else
16
+
You can’t perform that action at this time.
0 commit comments