aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/WString.h
diff options
context:
space:
mode:
authorDavid A. Mellis <d.mellis@arduino.cc>2011-03-13 19:39:04 -0400
committerDavid A. Mellis <d.mellis@arduino.cc>2011-03-13 19:39:04 -0400
commit45884b1231e43acdce51b381975977a3601e77d0 (patch)
tree90527507f4c3efc4040195c52021059fc37de87e /cores/arduino/WString.h
parenta5f6e6524282e23860ace324dcf81598287f9944 (diff)
Protecting String copy() and move().
Diffstat (limited to 'cores/arduino/WString.h')
-rw-r--r--cores/arduino/WString.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h
index 5a35101..6c07427 100644
--- a/cores/arduino/WString.h
+++ b/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