Commitc9346ee

committed

Remove guards as we alread require C++11

1 parent66aa7db commitc9346eeCopy full SHA for c9346ee

File tree

-12

lines changed

-12

lines changed

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ String::String(const __FlashStringHelper *pstr)`
`63`	`63`	`*this = pstr;`
`64`	`64`	`}`
`65`	`65`
`66`		`-#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`67`	`66`	`String::String(String &&rval)`
`68`	`67`	`: buffer(rval.buffer)`
`69`	`68`	`, capacity(rval.capacity)`
`@@ -73,7 +72,6 @@ String::String(String &&rval)`
`73`	`72`	`rval.capacity =0;`
`74`	`73`	`rval.len =0;`
`75`	`74`	`}`
`76`		`-#endif`
`77`	`75`
`78`	`76`	`String::String(char c)`
`79`	`77`	`{`
`@@ -213,7 +211,6 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)`
`213`	`211`	`return *this;`
`214`	`212`	`}`
`215`	`213`
`216`		`-#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`217`	`214`	`voidString::move(String &rhs)`
`218`	`215`	`{`
`219`	`216`	`if (this != &rhs)`
`@@ -229,7 +226,6 @@ void String::move(String &rhs)`
`229`	`226`	`rhs.capacity =0;`
`230`	`227`	`}`
`231`	`228`	`}`
`232`		`-#endif`
`233`	`229`
`234`	`230`	`String & String::operator = (const String &rhs)`
`235`	`231`	`{`
`@@ -241,13 +237,11 @@ String & String::operator = (const String &rhs)`
`241`	`237`	`return *this;`
`242`	`238`	`}`
`243`	`239`
`244`		`-#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`245`	`240`	`String & String::operator = (String &&rval)`
`246`	`241`	`{`
`247`	`242`	`move(rval);`
`248`	`243`	`return *this;`
`249`	`244`	`}`
`250`		`-#endif`
`251`	`245`
`252`	`246`	`String & String::operator = (constchar *cstr)`
`253`	`247`	`{`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,7 @@ class String`
`72`	`72`	`String(constuint8_t cstr,unsignedint length) : String((constchar)cstr, length) {}`
`73`	`73`	`String(const String &str);`
`74`	`74`	`String(const __FlashStringHelper *str);`
`75`		`-#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`76`	`75`	`String(String &&rval);`
`77`		`-#endif`
`78`	`76`	`explicitString(char c);`
`79`	`77`	`explicitString(unsignedchar,unsignedchar base=10);`
`80`	`78`	`explicitString(int,unsignedchar base=10);`
`@@ -98,9 +96,7 @@ class String`
`98`	`96`	`String &operator = (const String &rhs);`
`99`	`97`	`String &operator = (constchar *cstr);`
`100`	`98`	`String &operator = (const __FlashStringHelper *str);`
`101`		`-#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`102`	`99`	`String &operator = (String &&rval);`
`103`		`-#endif`
`104`	`100`
`105`	`101`	`// concatenate (works w/ built-in types)`
`106`	`102`
`@@ -231,9 +227,7 @@ class String`
`231`	`227`	`// copy and move`
`232`	`228`	`String &copy(constchar *cstr,unsignedint length);`
`233`	`229`	`String &copy(const __FlashStringHelper *pstr,unsignedint length);`
`234`		`-#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`235`	`230`	`voidmove(String &rhs);`
`236`		`-#endif`
`237`	`231`	`};`
`238`	`232`
`239`	`233`	`classStringSumHelper :publicString`

Comments

(0)