noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Conflicts:
	hardware/arduino/avr/cores/arduino/Print.cpp
This commit is contained in:
Cristian Maglie 2013-12-31 20:11:08 +01:00
parent 98777e816f 5d361f5f47
commit ffddfc81f6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/cores/arduino/Print.cpp
View File

@ -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++);