Merge branch 'cast' of github.com:Lauszus/Arduino into Lauszus-cast

cmaglie · cmaglie · commit 959e6a97fc2b · 2013-12-31T20:11:08.000+01:00
Conflicts:
	hardware/arduino/avr/cores/arduino/Print.cpp
diff --git a/arduino/avr/cores/arduino/Print.cpp b/arduino/avr/cores/arduino/Print.cpp
@@ -41,7 +41,7 @@ size_t Print::write(const uint8_t *buffer, size_t size)
 
 size_t Print::print(const __FlashStringHelper *ifsh)
 {
-  PGM_P p = (PGM_P)ifsh;
+  PGM_P p = reinterpret_cast<PGM_P>(ifsh);
   size_t n = 0;
   while (1) {
     unsigned char c = pgm_read_byte(p++);

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ size_t Print::write(const uint8_t *buffer, size_t size)`
`41`	`41`
`42`	`42`	`size_t Print::print(const __FlashStringHelper *ifsh)`
`43`	`43`	`{`
`44`		`- PGM_P p = (PGM_P)ifsh;`
	`44`	`+ PGM_P p = reinterpret_cast<PGM_P>(ifsh);`
`45`	`45`	`size_t n = 0;`
`46`	`46`	`while (1) {`
`47`	`47`	`unsigned char c = pgm_read_byte(p++);`