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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
index 86cac38..5df5630 100644
--- a/cores/arduino/Print.cpp
+++ b/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++);