1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00

Fixed string constructor overloading bug

This commit is contained in:
Matt Jenkins 2014-04-01 14:02:17 +01:00
parent 962d6d1e3a
commit 5bc28a178f
2 changed files with 4 additions and 4 deletions

View File

@ -100,14 +100,14 @@ String::String(unsigned long value, unsigned char base)
*this = buf; *this = buf;
} }
String::String(float value, int decimalPlaces) String::String(float value, unsigned char decimalPlaces)
{ {
init(); init();
char buf[33]; char buf[33];
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf); *this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
} }
String::String(double value, int decimalPlaces) String::String(double value, unsigned char decimalPlaces)
{ {
init(); init();
char buf[33]; char buf[33];

View File

@ -68,8 +68,8 @@ public:
explicit String(unsigned int, unsigned char base=10); explicit String(unsigned int, unsigned char base=10);
explicit String(long, unsigned char base=10); explicit String(long, unsigned char base=10);
explicit String(unsigned long, unsigned char base=10); explicit String(unsigned long, unsigned char base=10);
explicit String(float, int decimalPlaces=6); explicit String(float, unsigned char decimalPlaces=6);
explicit String(double, int decimalPlaces=6); explicit String(double, unsigned char decimalPlaces=6);
~String(void); ~String(void);
// memory management // memory management