Просмотр исходного кода

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

Benoit Blanchon 9 лет назад
Родитель
Сommit
2f7232859e
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 0
      CHANGELOG.md
  2. 1 1
      include/ArduinoJson/Internals/StringFuncs.hpp

+ 1 - 0
CHANGELOG.md

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

+ 1 - 1
include/ArduinoJson/Internals/StringFuncs.hpp

@@ -100,7 +100,7 @@ struct StringFuncs<std::string> : StdStringFuncs<std::string> {};
 template <>
 struct StringFuncs<const __FlashStringHelper*> {
   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>