Skip to content

Commit 2665025

Browse files
committed
Protecting String copy() and move().
1 parent 83fa790 commit 2665025

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

hardware/arduino/cores/arduino/WString.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ class String
6161
unsigned char reserve(unsigned int size);
6262
inline unsigned int length(void) const {return len;}
6363

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
6964
String & operator = (const String &rhs);
7065
String & operator = (const char *cstr);
7166
#ifdef __GXX_EXPERIMENTAL_CXX0X__
@@ -160,6 +155,12 @@ class String
160155
void init(void);
161156
unsigned char changeBuffer(unsigned int maxStrLen);
162157
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
163164
};
164165

165166
class StringSumHelper : public String

0 commit comments

Comments
 (0)