Moving move() to __GXX_EXPERIMENTAL_CXX0X__ only, adding operator bool().

1 files changed, 3 insertions, 0 deletions

diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h
index f797861..5e78ee5 100644
--- a/cores/arduino/WString.h
+++ b/cores/arduino/WString.h
@@ -63,7 +63,9 @@ public:
 
 	// copy and move
 	String & copy(const char *cstr, unsigned int length);
+	#ifdef __GXX_EXPERIMENTAL_CXX0X__
 	void move(String &rhs);
+	#endif
 	String & operator = (const String &rhs);
 	String & operator = (const char *cstr);
 	#ifdef __GXX_EXPERIMENTAL_CXX0X__
@@ -101,6 +103,7 @@ public:
 	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num);
 
 	// comparison
+	operator bool() const;
 	int compareTo(const String &s) const;
 	unsigned char equals(const String &s) const;
 	unsigned char equals(const char *cstr) const;