github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 16:14:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed PROGMEM causing an exception on ESP8266 (issue #383)

Browse Source
This commit is contained in:
Benoit Blanchon
2016-11-23 21:53:29 +01:00
parent 4a7232ac99
commit 2f7232859e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@ HEAD
---- ----
* Made PROGMEM available on more platforms (issue #381) * Made PROGMEM available on more platforms (issue #381)
* Fixed PROGMEM causing an exception on ESP8266 (issue #383)
v5.7.1 v5.7.1
------ ------

2
include/ArduinoJson/Internals/StringFuncs.hpp
View File

@@ -100,7 +100,7 @@ struct StringFuncs<std::string> : StdStringFuncs<std::string> {};
template <> template <>
struct StringFuncs<const __FlashStringHelper*> { struct StringFuncs<const __FlashStringHelper*> {
static bool equals(const __FlashStringHelper* str, const char* expected) { static bool equals(const __FlashStringHelper* str, const char* expected) {
return strcmp_P((PGM_P)str, expected) == 0; return strcmp_P(expected, (PGM_P)str) == 0;
} }
template <typename Buffer> template <typename Buffer>