Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit ec9a2b2

Browse files
committed
third-party/arduino-json: restore string override ifdef guard
1 parent 32c3b28 commit ec9a2b2

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

src/third-party/arduino-json-5.2/include/ArduinoJson/Arduino/String.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99

1010
#ifndef ARDUINO
1111

12+
#ifndef ARDUINO_STRING_OVERRIDE
13+
#define ARDUINO_STRING_OVERRIDE
1214
#include <string>
1315
typedef std::string String;
16+
#endif
1417

1518
#else
1619

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+

0 commit comments

Comments
 (0)