Skip to content
This repository
Browse code

Protecting String copy() and move().

  • Loading branch information...
commit 6f3ceb399da6411b40ec97525af7397ba96556ee 1 parent 488e672
David A. Mellis authored March 13, 2011

Showing 1 changed file with 6 additions and 5 deletions. Show diff stats Hide diff stats

  1. 11  hardware/arduino/cores/arduino/WString.h
11  hardware/arduino/cores/arduino/WString.h
@@ -61,11 +61,6 @@ class String
61 61
 	unsigned char reserve(unsigned int size);
62 62
 	inline unsigned int length(void) const {return len;}
63 63
 
64  
-	// copy and move
65  
-	String & copy(const char *cstr, unsigned int length);
66  
-	#ifdef __GXX_EXPERIMENTAL_CXX0X__
67  
-	void move(String &rhs);
68  
-	#endif
69 64
 	String & operator = (const String &rhs);
70 65
 	String & operator = (const char *cstr);
71 66
 	#ifdef __GXX_EXPERIMENTAL_CXX0X__
@@ -160,6 +155,12 @@ class String
160 155
 	void init(void);
161 156
 	unsigned char changeBuffer(unsigned int maxStrLen);
162 157
 	unsigned char concat(const char *cstr, unsigned int length);
  158
+
  159
+	// copy and move
  160
+	String & copy(const char *cstr, unsigned int length);
  161
+	#ifdef __GXX_EXPERIMENTAL_CXX0X__
  162
+	void move(String &rhs);
  163
+	#endif
163 164
 };
164 165
 
165 166
 class StringSumHelper : public String

0 notes on commit 6f3ceb3

Please sign in to comment.
Something went wrong with that request. Please try again.