aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jenkins <matt@majenko.co.uk>2014-04-01 14:02:17 +0100
committerMatt Jenkins <matt@majenko.co.uk>2014-04-01 14:02:17 +0100
commit3fb1c595d1c12e547517e1e0810de9bd079c55a4 (patch)
tree0068cdb40879d3eab019cc01bdbfed755713d01b
parent823d9584184161d5d72ef1f49045799c10da5f1c (diff)
Fixed string constructor overloading bug
-rw-r--r--cores/arduino/WString.cpp4
-rw-r--r--cores/arduino/WString.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp
index e19f543..47afddf 100644
--- a/cores/arduino/WString.cpp
+++ b/cores/arduino/WString.cpp
@@ -100,14 +100,14 @@ String::String(unsigned long value, unsigned char base)
*this = buf;
}
-String::String(float value, int decimalPlaces)
+String::String(float value, unsigned char decimalPlaces)
{
init();
char buf[33];
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}
-String::String(double value, int decimalPlaces)
+String::String(double value, unsigned char decimalPlaces)
{
init();
char buf[33];
diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h
index 2d372c5..f4da569 100644
--- a/cores/arduino/WString.h
+++ b/cores/arduino/WString.h
@@ -68,8 +68,8 @@ public:
explicit String(unsigned int, unsigned char base=10);
explicit String(long, unsigned char base=10);
explicit String(unsigned long, unsigned char base=10);
- explicit String(float, int decimalPlaces=6);
- explicit String(double, int decimalPlaces=6);
+ explicit String(float, unsigned char decimalPlaces=6);
+ explicit String(double, unsigned char decimalPlaces=6);
~String(void);
// memory management