Merge pull request arduino#213 from jboynes/clang_tidy

aentinger · web-flow · commit 6cd8d8af6953 · 2023-09-13T14:24:07.000+02:00
Remove guards as we already require C++11
diff --git a/api/String.cpp b/api/String.cpp
@@ -63,7 +63,6 @@ String::String(const __FlashStringHelper *pstr)
 	*this = pstr;
 }
 
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 String::String(String &&rval)
 	: buffer(rval.buffer)
 	, capacity(rval.capacity)
@@ -73,7 +72,6 @@ String::String(String &&rval)
 	rval.capacity = 0;
 	rval.len = 0;
 }
-#endif
 
 String::String(char c)
 {
@@ -213,7 +211,6 @@ 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)
@@ -229,7 +226,6 @@ void String::move(String &rhs)
 		rhs.capacity = 0;
 	}
 }
-#endif
 
 String & String::operator = (const String &rhs)
 {
@@ -241,13 +237,11 @@ 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)
 {
diff --git a/api/String.h b/api/String.h
@@ -72,9 +72,7 @@ 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);
@@ -98,9 +96,7 @@ 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)
 
@@ -231,9 +227,7 @@ 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,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`	`void String::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 = (const char *cstr)`
`253`	`247`	`{`