Merge remote-tracking branch 'origin/master' into string/no-sum-helper

cores/esp8266/StreamString.h

@@ -236,7 +236,6 @@ class StreamString: public String, public S2Stream
  StreamString(const String& string): String(string), S2Stream(this) { }
  StreamString(const __FlashStringHelper *str): String(str), S2Stream(this) { }
  StreamString(String&& string): String(string), S2Stream(this) { }
- StreamString(StringSumHelper&& sum): String(sum), S2Stream(this) { }
 
  explicit StreamString(char c): String(c), S2Stream(this) { }
  explicit StreamString(unsigned char c, unsigned char base = 10): String(c, base), S2Stream(this) { }
@@ -281,13 +280,6 @@ class StreamString: public String, public S2Stream
  resetpp();
  return *this;
  }
-
- StreamString& operator= (StringSumHelper&& rval)
- {
- String::operator=(rval);
- resetpp();
- return *this;
- }
 };
 
 #endif // __STREAMSTRING_H

cores/esp8266/WString.cpp

@@ -25,12 +25,6 @@
 #include "WString.h"
 #include "stdlib_noniso.h"
 
-#define OOM_STRING_BORDER_DISPLAY 10
-#define OOM_STRING_THRESHOLD_REALLOC_WARN 128
-
-#define __STRHELPER(x) #x
-#define STR(x) __STRHELPER(x) // stringifier
-
 /*********************************************/
 /* Constructors */
 /*********************************************/