Inline some print() functions

cousteaulecommandant · matthijskooijman · commit d9a868281210 · 2018-05-29T15:34:07.000+02:00
Remove print(char | char[] | Printable | unsigned char | int | unsigned int)
from Print.cpp and replace them with inline versions in Print.h.
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
@@ -59,31 +59,6 @@ size_t Print::print(const String &s)
   return write(s.c_str(), s.length());
 }
 
-size_t Print::print(const char str[])
-{
-  return write(str);
-}
-
-size_t Print::print(char c)
-{
-  return write(c);
-}
-
-size_t Print::print(unsigned char b, int base)
-{
-  return print((unsigned long) b, base);
-}
-
-size_t Print::print(int n, int base)
-{
-  return print((long) n, base);
-}
-
-size_t Print::print(unsigned int n, int base)
-{
-  return print((unsigned long) n, base);
-}
-
 size_t Print::print(long n, int base)
 {
   if (base == 0) {
@@ -111,11 +86,6 @@ size_t Print::print(double n, int digits)
   return printFloat(n, digits);
 }
 
-size_t Print::print(const Printable& x)
-{
-  return x.printTo(*this);
-}
-
 size_t Print::println(void)
 {
   return write("\r\n");
diff --git a/cores/arduino/Print.h b/cores/arduino/Print.h
@@ -64,16 +64,18 @@ class Print
 
     size_t print(const __FlashStringHelper *);
     size_t print(const String &);
-    size_t print(const char[]);
-    size_t print(char);
-    size_t print(unsigned char, int = DEC);
-    size_t print(int, int = DEC);
-    size_t print(unsigned int, int = DEC);
     size_t print(long, int = DEC);
     size_t print(unsigned long, int = DEC);
     size_t print(double, int = 2);
-    size_t print(const Printable&);
-
+    
+    size_t print(const char str[])   { return write(str); }
+    size_t print(const char c)       { return write(c); }
+    size_t print(const Printable &x) { return x.printTo(*this); }
+    
+    size_t print(unsigned char  n, int f = DEC) { return print((unsigned long) n, f); }
+    size_t print(         int   n, int f = DEC) { return print((         long) n, f); }
+    size_t print(unsigned int   n, int f = DEC) { return print((unsigned long) n, f); }
+    
     size_t println(void);
 
     virtual void flush() { /* Empty implementation for backward compatibility */ }
