[gnoduino: 27/237] Protecting String copy() and move().



commit 3551802a37a7296e0e934f8ce3fd3ce8db09f343
Author: David A. Mellis <d mellis arduino cc>
Date:   Sun Mar 13 19:39:04 2011 -0400

    Protecting String copy() and move().

 arduino/cores/arduino/WString.h |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/arduino/cores/arduino/WString.h b/arduino/cores/arduino/WString.h
index 5a35101..6c07427 100644
--- a/arduino/cores/arduino/WString.h
+++ b/arduino/cores/arduino/WString.h
@@ -61,11 +61,6 @@ public:
 	unsigned char reserve(unsigned int size);
 	inline unsigned int length(void) const {return len;}
 
-	// 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__
@@ -160,6 +155,12 @@ protected:
 	void init(void);
 	unsigned char changeBuffer(unsigned int maxStrLen);
 	unsigned char concat(const char *cstr, unsigned int length);
+
+	// copy and move
+	String & copy(const char *cstr, unsigned int length);
+	#ifdef __GXX_EXPERIMENTAL_CXX0X__
+	void move(String &rhs);
+	#endif
 };
 
 class StringSumHelper : public String



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]