Merge remote-tracking branch 'upstream/esp8266'

sandeepmistry · sandeepmistry · commit 69b4582ed9ce · 2015-03-31T18:54:31.000-04:00
diff --git a/esp8266com/esp8266/cores/esp8266/WString.h b/esp8266com/esp8266/cores/esp8266/WString.h
@@ -32,6 +32,9 @@
 // result objects are assumed to be writable by subsequent concatenations.
 class StringSumHelper;
 
+typedef char* __FlashStringHelper;
+#define F(str) str
+
 // The string class
 class String
 {

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@`
`32`	`32`	`// result objects are assumed to be writable by subsequent concatenations.`
`33`	`33`	`class StringSumHelper;`
`34`	`34`
	`35`	`+typedef char* __FlashStringHelper;`
	`36`	`+#define F(str) str`
	`37`	`+`
`35`	`38`	`// The string class`
`36`	`39`	`class String`
`37`	`40`	`{`