diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2014-07-07 19:54:31 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@arduino.cc> | 2015-07-16 13:06:10 +0200 |
| commit | 72a5ef3c7834bd3ebf0fcccdb272a334645ba3a7 (patch) | |
| tree | db55e1c1579157e4af4e43aab9ebcba982c69fa3 /cores | |
| parent | c84ff4d1778592009724f2078c7f6453a31b1a3f (diff) | |
Check for __cplusplus >= 201103L as well as __GXX_EXPERIMENTAL_CXX0X__
Gcc 4.8 defines __cplusplus as 201103L, so we can check for that now. It
still also defines __GXX_EXPERIMENTAL_CXX0X__, but this could help on
other compilers, or if gcc ever decides to stop defining the
experimental macro.
Diffstat (limited to 'cores')
| -rw-r--r-- | cores/arduino/WString.cpp | 6 | ||||
| -rw-r--r-- | cores/arduino/WString.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp index dcd469d..cd3e0e8 100644 --- a/cores/arduino/WString.cpp +++ b/cores/arduino/WString.cpp @@ -43,7 +43,7 @@ String::String(const __FlashStringHelper *pstr) *this = pstr; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) String::String(String &&rval) { init(); @@ -189,7 +189,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length) return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) void String::move(String &rhs) { if (buffer) { @@ -221,7 +221,7 @@ String & String::operator = (const String &rhs) return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) String & String::operator = (String &&rval) { if (this != &rval) move(rval); diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h index 7402430..b047980 100644 --- a/cores/arduino/WString.h +++ b/cores/arduino/WString.h @@ -59,7 +59,7 @@ public: String(const char *cstr = ""); String(const String &str); String(const __FlashStringHelper *str); - #ifdef __GXX_EXPERIMENTAL_CXX0X__ + #if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) String(String &&rval); String(StringSumHelper &&rval); #endif @@ -86,7 +86,7 @@ public: String & operator = (const String &rhs); String & operator = (const char *cstr); String & operator = (const __FlashStringHelper *str); - #ifdef __GXX_EXPERIMENTAL_CXX0X__ + #if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) String & operator = (String &&rval); String & operator = (StringSumHelper &&rval); #endif @@ -200,7 +200,7 @@ protected: // copy and move String & copy(const char *cstr, unsigned int length); String & copy(const __FlashStringHelper *pstr, unsigned int length); - #ifdef __GXX_EXPERIMENTAL_CXX0X__ + #if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) void move(String &rhs); #endif }; |