Skip to content

Commit d6058b9

Browse files
Inline some print() functions
Remove print(char | char[] | Printable | unsigned char | int | unsigned int) from Print.cpp and replace them with inline versions in Print.h.
1 parent b9281c9 commit d6058b9

File tree

4 files changed

+18
-74
lines changed

4 files changed

+18
-74
lines changed

hardware/arduino/avr/cores/arduino/Print.cpp

-30
Original file line numberDiff line numberDiff line change
@@ -59,31 +59,6 @@ size_t Print::print(const String &s)
5959
return write(s.c_str(), s.length());
6060
}
6161

62-
size_t Print::print(const char str[])
63-
{
64-
return write(str);
65-
}
66-
67-
size_t Print::print(char c)
68-
{
69-
return write(c);
70-
}
71-
72-
size_t Print::print(unsigned char b, int base)
73-
{
74-
return print((unsigned long) b, base);
75-
}
76-
77-
size_t Print::print(int n, int base)
78-
{
79-
return print((long) n, base);
80-
}
81-
82-
size_t Print::print(unsigned int n, int base)
83-
{
84-
return print((unsigned long) n, base);
85-
}
86-
8762
size_t Print::print(long n, int base)
8863
{
8964
if (base == 0) {
@@ -111,11 +86,6 @@ size_t Print::print(double n, int digits)
11186
return printFloat(n, digits);
11287
}
11388

114-
size_t Print::print(const Printable& x)
115-
{
116-
return x.printTo(*this);
117-
}
118-
11989
size_t Print::println(void)
12090
{
12191
return write("\r\n");

hardware/arduino/avr/cores/arduino/Print.h

+9-7
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,18 @@ class Print
5757

5858
size_t print(const __FlashStringHelper *);
5959
size_t print(const String &);
60-
size_t print(const char[]);
61-
size_t print(char);
62-
size_t print(unsigned char, int = DEC);
63-
size_t print(int, int = DEC);
64-
size_t print(unsigned int, int = DEC);
6560
size_t print(long, int = DEC);
6661
size_t print(unsigned long, int = DEC);
6762
size_t print(double, int = 2);
68-
size_t print(const Printable&);
69-
63+
64+
size_t print(const char str[]) { return write(str); }
65+
size_t print(const char c) { return write(c); }
66+
size_t print(const Printable &x) { return x.printTo(*this); }
67+
68+
size_t print(unsigned char n, int f = DEC) { return print((unsigned long) n, f); }
69+
size_t print( int n, int f = DEC) { return print(( long) n, f); }
70+
size_t print(unsigned int n, int f = DEC) { return print((unsigned long) n, f); }
71+
7072
size_t println(void);
7173

7274
template<typename T> size_t println(const T &arg) { size_t t = print(arg); return t + println(); }

hardware/arduino/sam/cores/arduino/Print.cpp

-30
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,6 @@ size_t Print::print(const String &s)
5151
return write(s.c_str(), s.length());
5252
}
5353

54-
size_t Print::print(const char str[])
55-
{
56-
return write(str);
57-
}
58-
59-
size_t Print::print(char c)
60-
{
61-
return write(c);
62-
}
63-
64-
size_t Print::print(unsigned char b, int base)
65-
{
66-
return print((unsigned long) b, base);
67-
}
68-
69-
size_t Print::print(int n, int base)
70-
{
71-
return print((long) n, base);
72-
}
73-
74-
size_t Print::print(unsigned int n, int base)
75-
{
76-
return print((unsigned long) n, base);
77-
}
78-
7954
size_t Print::print(long n, int base)
8055
{
8156
if (base == 0) {
@@ -103,11 +78,6 @@ size_t Print::print(double n, int digits)
10378
return printFloat(n, digits);
10479
}
10580

106-
size_t Print::print(const Printable& x)
107-
{
108-
return x.printTo(*this);
109-
}
110-
11181
size_t Print::println(void)
11282
{
11383
return write("\r\n");

hardware/arduino/sam/cores/arduino/Print.h

+9-7
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,18 @@ class Print
5757

5858
size_t print(const __FlashStringHelper *);
5959
size_t print(const String &);
60-
size_t print(const char[]);
61-
size_t print(char);
62-
size_t print(unsigned char, int = DEC);
63-
size_t print(int, int = DEC);
64-
size_t print(unsigned int, int = DEC);
6560
size_t print(long, int = DEC);
6661
size_t print(unsigned long, int = DEC);
6762
size_t print(double, int = 2);
68-
size_t print(const Printable&);
69-
63+
64+
size_t print(const char str[]) { return write(str); }
65+
size_t print(const char c) { return write(c); }
66+
size_t print(const Printable &x) { return x.printTo(*this); }
67+
68+
size_t print(unsigned char n, int f = DEC) { return print((unsigned long) n, f); }
69+
size_t print( int n, int f = DEC) { return print(( long) n, f); }
70+
size_t print(unsigned int n, int f = DEC) { return print((unsigned long) n, f); }
71+
7072
size_t println(void);
7173

7274
template<typename T> size_t println(const T &arg) { size_t t = print(arg); return t + println(); }

0 commit comments

Comments
 (0)