From 7fff98a3fda2c84d36e501d987e980e9631368c6 Mon Sep 17 00:00:00 2001 From: sg- Date: Mon, 23 Nov 2015 10:08:51 -0600 Subject: [PATCH] use cstdarg lib and not stdarg --- libraries/mbed/api/Stream.h | 6 +++--- libraries/mbed/common/Stream.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/mbed/api/Stream.h b/libraries/mbed/api/Stream.h index c1ee429ea8..a83403863b 100644 --- a/libraries/mbed/api/Stream.h +++ b/libraries/mbed/api/Stream.h @@ -18,7 +18,7 @@ #include "platform.h" #include "FileLike.h" -#include "stdarg.h" +#include "cstdarg" namespace mbed { @@ -38,8 +38,8 @@ public: char *gets(char *s, int size); int printf(const char* format, ...); int scanf(const char* format, ...); - int vprintf(const char* format, va_list args); - int vscanf(const char* format, va_list args); + int vprintf(const char* format, std::va_list args); + int vscanf(const char* format, std::va_list args); operator std::FILE*() {return _file;} diff --git a/libraries/mbed/common/Stream.cpp b/libraries/mbed/common/Stream.cpp index 3302442a92..2b3105f27c 100644 --- a/libraries/mbed/common/Stream.cpp +++ b/libraries/mbed/common/Stream.cpp @@ -89,7 +89,7 @@ off_t Stream::flen() { } int Stream::printf(const char* format, ...) { - va_list arg; + std::va_list arg; va_start(arg, format); fflush(_file); int r = vfprintf(_file, format, arg); @@ -98,7 +98,7 @@ int Stream::printf(const char* format, ...) { } int Stream::scanf(const char* format, ...) { - va_list arg; + std::va_list arg; va_start(arg, format); fflush(_file); int r = vfscanf(_file, format, arg); @@ -106,13 +106,13 @@ int Stream::scanf(const char* format, ...) { return r; } -int Stream::vprintf(const char* format, va_list args) { +int Stream::vprintf(const char* format, std::va_list args) { fflush(_file); int r = vfprintf(_file, format, args); return r; } -int Stream::vscanf(const char* format, va_list args) { +int Stream::vscanf(const char* format, std::va_list args) { fflush(_file); int r = vfscanf(_file, format, args); return r;