Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery

1 files changed, 2 insertions, 2 deletions

diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp
index e462bee..63af6d3 100644
--- a/cores/arduino/WString.cpp
+++ b/cores/arduino/WString.cpp
@@ -106,14 +106,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];