From 00210189fe1d8f38601b065ebbb9292dc373692e Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 20 Aug 2013 15:15:47 +0200 Subject: [PATCH] Removed unused flags from String (free 1 byte of SRAM) --- build/shared/revisions.txt | 1 + hardware/arduino/avr/cores/arduino/WString.cpp | 1 - hardware/arduino/avr/cores/arduino/WString.h | 1 - hardware/arduino/avr/cores/robot/WString.cpp | 1 - hardware/arduino/avr/cores/robot/WString.h | 3 +-- hardware/arduino/sam/cores/arduino/WString.cpp | 1 - hardware/arduino/sam/cores/arduino/WString.h | 1 - 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index 4f2d3dbef..67f6bae33 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -22,6 +22,7 @@ ARDUINO 1.5.3 BETA * avr: Added recipe for assembly files (C. A. Church) * avr: Use analogPinToChannel if it's defined (Kristian Sloth Lauszus) * avr: Optimized HardwareSerial buffer (Matthijs Kooijman) +* removed unused flags from String (free 1 byte of SRAM) [libraries] * sam: Added CAN library (still in early stage of development) (Palliser) diff --git a/hardware/arduino/avr/cores/arduino/WString.cpp b/hardware/arduino/avr/cores/arduino/WString.cpp index db79da41f..e462beeb2 100644 --- a/hardware/arduino/avr/cores/arduino/WString.cpp +++ b/hardware/arduino/avr/cores/arduino/WString.cpp @@ -134,7 +134,6 @@ inline void String::init(void) buffer = NULL; capacity = 0; len = 0; - flags = 0; } void String::invalidate(void) diff --git a/hardware/arduino/avr/cores/arduino/WString.h b/hardware/arduino/avr/cores/arduino/WString.h index b3b9f1427..f801f6384 100644 --- a/hardware/arduino/avr/cores/arduino/WString.h +++ b/hardware/arduino/avr/cores/arduino/WString.h @@ -191,7 +191,6 @@ protected: char *buffer; // the actual char array unsigned int capacity; // the array length minus one (for the '\0') unsigned int len; // the String length (not counting the '\0') - unsigned char flags; // unused, for future features protected: void init(void); void invalidate(void); diff --git a/hardware/arduino/avr/cores/robot/WString.cpp b/hardware/arduino/avr/cores/robot/WString.cpp index db79da41f..e462beeb2 100644 --- a/hardware/arduino/avr/cores/robot/WString.cpp +++ b/hardware/arduino/avr/cores/robot/WString.cpp @@ -134,7 +134,6 @@ inline void String::init(void) buffer = NULL; capacity = 0; len = 0; - flags = 0; } void String::invalidate(void) diff --git a/hardware/arduino/avr/cores/robot/WString.h b/hardware/arduino/avr/cores/robot/WString.h index 0404f767a..f801f6384 100644 --- a/hardware/arduino/avr/cores/robot/WString.h +++ b/hardware/arduino/avr/cores/robot/WString.h @@ -113,7 +113,7 @@ public: String & operator += (const String &rhs) {concat(rhs); return (*this);} String & operator += (const char *cstr) {concat(cstr); return (*this);} String & operator += (char c) {concat(c); return (*this);} - String & operator += (unsigned char num) {concat(num); return (*this);} + String & operator += (unsigned char num) {concat(num); return (*this);} String & operator += (int num) {concat(num); return (*this);} String & operator += (unsigned int num) {concat(num); return (*this);} String & operator += (long num) {concat(num); return (*this);} @@ -191,7 +191,6 @@ protected: char *buffer; // the actual char array unsigned int capacity; // the array length minus one (for the '\0') unsigned int len; // the String length (not counting the '\0') - unsigned char flags; // unused, for future features protected: void init(void); void invalidate(void); diff --git a/hardware/arduino/sam/cores/arduino/WString.cpp b/hardware/arduino/sam/cores/arduino/WString.cpp index 7b46f05d1..a6b82fd61 100644 --- a/hardware/arduino/sam/cores/arduino/WString.cpp +++ b/hardware/arduino/sam/cores/arduino/WString.cpp @@ -135,7 +135,6 @@ inline void String::init(void) buffer = NULL; capacity = 0; len = 0; - flags = 0; } void String::invalidate(void) diff --git a/hardware/arduino/sam/cores/arduino/WString.h b/hardware/arduino/sam/cores/arduino/WString.h index 0404f767a..f0077dfbe 100644 --- a/hardware/arduino/sam/cores/arduino/WString.h +++ b/hardware/arduino/sam/cores/arduino/WString.h @@ -191,7 +191,6 @@ protected: char *buffer; // the actual char array unsigned int capacity; // the array length minus one (for the '\0') unsigned int len; // the String length (not counting the '\0') - unsigned char flags; // unused, for future features protected: void init(void); void invalidate(void);