From 61a35589460136b56f7a689108ff6c828eb0053c Mon Sep 17 00:00:00 2001 From: Matt Robinson Date: Thu, 17 Jul 2014 16:44:30 +0100 Subject: [PATCH] Cast empty string to char* to fix compiler warning Stream::find(char *target) passes an empty terminator string to Stream::findUntil(char *target, char *terminator) which caused a compiler warning with the updated toolchain, so cast it to a char*. --- hardware/arduino/avr/cores/arduino/Stream.cpp | 2 +- hardware/arduino/sam/cores/arduino/Stream.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hardware/arduino/avr/cores/arduino/Stream.cpp b/hardware/arduino/avr/cores/arduino/Stream.cpp index 39873aac8..9c581bee1 100644 --- a/hardware/arduino/avr/cores/arduino/Stream.cpp +++ b/hardware/arduino/avr/cores/arduino/Stream.cpp @@ -75,7 +75,7 @@ void Stream::setTimeout(unsigned long timeout) // sets the maximum number of mi // find returns true if the target string is found bool Stream::find(char *target) { - return findUntil(target, ""); + return findUntil(target, (char*)""); } // reads data from the stream until the target string of given length is found diff --git a/hardware/arduino/sam/cores/arduino/Stream.cpp b/hardware/arduino/sam/cores/arduino/Stream.cpp index 39873aac8..9c581bee1 100644 --- a/hardware/arduino/sam/cores/arduino/Stream.cpp +++ b/hardware/arduino/sam/cores/arduino/Stream.cpp @@ -75,7 +75,7 @@ void Stream::setTimeout(unsigned long timeout) // sets the maximum number of mi // find returns true if the target string is found bool Stream::find(char *target) { - return findUntil(target, ""); + return findUntil(target, (char*)""); } // reads data from the stream until the target string of given length is found