arduino
diff --git a/‎api/String.cpp
Copy file name to clipboardExpand all lines: api/String.cpp
+6Lines changed: 6 additions & 0 deletions b/‎api/String.cpp
Copy file name to clipboardExpand all lines: api/String.cpp
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎api/String.h
Copy file name to clipboardExpand all lines: api/String.h
+6Lines changed: 6 additions & 0 deletions b/‎api/String.h
Copy file name to clipboardExpand all lines: api/String.h
+6Lines changed: 6 additions & 0 deletions
@@ -63,6 +63,7 @@ String::String(const __FlashStringHelper *pstr)
 	*this = pstr;
 }
 
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 String::String(String &&rval)
 	: buffer(rval.buffer)
 	, capacity(rval.capacity)
@@ -72,6 +73,7 @@ String::String(String &&rval)
 	rval.capacity = 0;
 	rval.len = 0;
 }
+#endif
 
 String::String(char c)
 {
@@ -211,6 +213,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
 	return *this;
 }
 
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 void String::move(String &rhs)
 {
 	if (this != &rhs)
@@ -226,6 +229,7 @@ void String::move(String &rhs)
 		rhs.capacity = 0;
 	}
 }
+#endif
 
 String & String::operator = (const String &rhs)
 {
@@ -237,11 +241,13 @@ String & String::operator = (const String &rhs)
 	return *this;
 }
 
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 String & String::operator = (String &&rval)
 {
 	move(rval);
 	return *this;
 }
+#endif
 
 String & String::operator = (const char *cstr)
 {
 
@@ -72,7 +72,9 @@ class String
 	String(const uint8_t *cstr, unsigned int length) : String((const char*)cstr, length) {}
 	String(const String &str);
 	String(const __FlashStringHelper *str);
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 	String(String &&rval);
+#endif
 	explicit String(char c);
 	explicit String(unsigned char, unsigned char base=10);
 	explicit String(int, unsigned char base=10);
@@ -96,7 +98,9 @@ class String
 	String & operator = (const String &rhs);
 	String & operator = (const char *cstr);
 	String & operator = (const __FlashStringHelper *str);
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 	String & operator = (String &&rval);
+#endif
 
 	// concatenate (works w/ built-in types)
 
@@ -227,7 +231,9 @@ class String
 	// copy and move
 	String & copy(const char *cstr, unsigned int length);
 	String & copy(const __FlashStringHelper *pstr, unsigned int length);
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 	void move(String &rhs);
+#endif
 };
 
 class StringSumHelper : public String
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ String::String(const __FlashStringHelper *pstr)`
`63`	`63`	`*this = pstr;`
`64`	`64`	`}`
`65`	`65`
	`66`	`+#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`66`	`67`	`String::String(String &&rval)`
`67`	`68`	`: buffer(rval.buffer)`
`68`	`69`	`, capacity(rval.capacity)`
`@@ -72,6 +73,7 @@ String::String(String &&rval)`
`72`	`73`	`rval.capacity = 0;`
`73`	`74`	`rval.len = 0;`
`74`	`75`	`}`
	`76`	`+#endif`
`75`	`77`
`76`	`78`	`String::String(char c)`
`77`	`79`	`{`
`@@ -211,6 +213,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)`
`211`	`213`	`return *this;`
`212`	`214`	`}`
`213`	`215`
	`216`	`+#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`214`	`217`	`void String::move(String &rhs)`
`215`	`218`	`{`
`216`	`219`	`if (this != &rhs)`
`@@ -226,6 +229,7 @@ void String::move(String &rhs)`
`226`	`229`	`rhs.capacity = 0;`
`227`	`230`	`}`
`228`	`231`	`}`
	`232`	`+#endif`
`229`	`233`
`230`	`234`	`String & String::operator = (const String &rhs)`
`231`	`235`	`{`
`@@ -237,11 +241,13 @@ String & String::operator = (const String &rhs)`
`237`	`241`	`return *this;`
`238`	`242`	`}`
`239`	`243`
	`244`	`+#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__)`
`240`	`245`	`String & String::operator = (String &&rval)`
`241`	`246`	`{`
`242`	`247`	`move(rval);`
`243`	`248`	`return *this;`
`244`	`249`	`}`
	`250`	`+#endif`
`245`	`251`
`246`	`252`	`String & String::operator = (const char *cstr)`
`247`	`253`	`{`