Skip to content

Commit 6cd8d8a

Browse files
authored
Merge pull request #213 from jboynes/clang_tidy
Remove guards as we already require C++11
2 parents 66aa7db + c9346ee commit 6cd8d8a

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

Diff for: api/String.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ String::String(const __FlashStringHelper *pstr)
6363
*this = pstr;
6464
}
6565

66-
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
6766
String::String(String &&rval)
6867
: buffer(rval.buffer)
6968
, capacity(rval.capacity)
@@ -73,7 +72,6 @@ String::String(String &&rval)
7372
rval.capacity = 0;
7473
rval.len = 0;
7574
}
76-
#endif
7775

7876
String::String(char c)
7977
{
@@ -213,7 +211,6 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
213211
return *this;
214212
}
215213

216-
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
217214
void String::move(String &rhs)
218215
{
219216
if (this != &rhs)
@@ -229,7 +226,6 @@ void String::move(String &rhs)
229226
rhs.capacity = 0;
230227
}
231228
}
232-
#endif
233229

234230
String & String::operator = (const String &rhs)
235231
{
@@ -241,13 +237,11 @@ String & String::operator = (const String &rhs)
241237
return *this;
242238
}
243239

244-
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
245240
String & String::operator = (String &&rval)
246241
{
247242
move(rval);
248243
return *this;
249244
}
250-
#endif
251245

252246
String & String::operator = (const char *cstr)
253247
{

Diff for: api/String.h

-6
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ class String
7272
String(const uint8_t *cstr, unsigned int length) : String((const char*)cstr, length) {}
7373
String(const String &str);
7474
String(const __FlashStringHelper *str);
75-
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
7675
String(String &&rval);
77-
#endif
7876
explicit String(char c);
7977
explicit String(unsigned char, unsigned char base=10);
8078
explicit String(int, unsigned char base=10);
@@ -98,9 +96,7 @@ class String
9896
String & operator = (const String &rhs);
9997
String & operator = (const char *cstr);
10098
String & operator = (const __FlashStringHelper *str);
101-
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
10299
String & operator = (String &&rval);
103-
#endif
104100

105101
// concatenate (works w/ built-in types)
106102

@@ -231,9 +227,7 @@ class String
231227
// copy and move
232228
String & copy(const char *cstr, unsigned int length);
233229
String & copy(const __FlashStringHelper *pstr, unsigned int length);
234-
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
235230
void move(String &rhs);
236-
#endif
237231
};
238232

239233
class StringSumHelper : public String

0 commit comments

Comments
 (0)