Merge branch 'master' into sizes_stderr

esp8266 · May 17, 2022 · 3c12311 · 3c12311
2 parents 49a209d + fbba25c
commit 3c12311
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/cores/esp8266/WString.h b/cores/esp8266/WString.h
@@ -227,18 +227,12 @@ class String {
         bool operator ==(const char *cstr) const {
             return equals(cstr);
         }
-        bool operator ==(const __FlashStringHelper *rhs) const {
-            return equals(rhs);
-        }
         bool operator !=(const String &rhs) const {
             return !equals(rhs);
         }
         bool operator !=(const char *cstr) const {
             return !equals(cstr);
         }
-        bool operator !=(const __FlashStringHelper *rhs) const {
-            return !equals(rhs);
-        }
         bool operator <(const String &rhs) const;
         bool operator >(const String &rhs) const;
         bool operator <=(const String &rhs) const;