From 76776e7a46b30ee84f48db146bf8dd642de2927a Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Sun, 13 Mar 2011 16:46:06 -0400
Subject: Moving move() to __GXX_EXPERIMENTAL_CXX0X__ only, adding operator
 bool().

---
 cores/arduino/WString.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'cores/arduino/WString.cpp')

diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp
index 5dcf585..41c80e8 100644
--- a/cores/arduino/WString.cpp
+++ b/cores/arduino/WString.cpp
@@ -157,6 +157,7 @@ String & String::copy(const char *cstr, unsigned int length)
 	return *this;
 }
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
 void String::move(String &rhs)
 {
 	if (buffer) {
@@ -176,6 +177,7 @@ void String::move(String &rhs)
 	rhs.capacity = 0;
 	rhs.len = 0;
 }
+#endif
 
 String & String::operator = (const String &rhs)
 {
@@ -340,6 +342,11 @@ StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num)
 /*  Comparison                               */
 /*********************************************/
 
+String::operator bool() const
+{
+	return !!buffer;
+}
+
 int String::compareTo(const String &s) const
 {
 	if (!buffer || !s.buffer) {
-- 
cgit v1.2.3-18-g5258