Commitec9a2b2

committed

third-party/arduino-json: restore string override ifdef guard

1 parent32c3b28 commitec9a2b2Copy full SHA for ec9a2b2

File tree

+19

-0

lines changed

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

+19

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,11 @@`
`9`	`9`
`10`	`10`	`#ifndef ARDUINO`
`11`	`11`
	`12`	`+#ifndef ARDUINO_STRING_OVERRIDE`
	`13`	`+#defineARDUINO_STRING_OVERRIDE`
`12`	`14`	`#include<string>`
`13`	`15`	`typedef std::string String;`
	`16`	`+#endif`
`14`	`17`
`15`	`18`	`#else`
`16`	`19`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff 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`	`+`

Comments

(0)