Skip to content

Commit 6be510d

Browse files
authored
Merge pull request #10900 from TeroJaasko/armcc5_compilation_fixes
Armcc5 compilation fixes
2 parents 76f085b + bae3043 commit 6be510d

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

features/cellular/framework/AT/ATHandler.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "rtos/ThisThread.h"
2727
#include "Kernel.h"
2828
#include "CellularUtil.h"
29-
#include <stdarg.h>
3029
#include "SingletonPtr.h"
3130

3231
using namespace mbed;
@@ -1223,7 +1222,7 @@ void ATHandler::cmd_start(const char *cmd)
12231222
_cmd_start = true;
12241223
}
12251224

1226-
void ATHandler::handle_args(const char *format, va_list list)
1225+
void ATHandler::handle_args(const char *format, std::va_list list)
12271226
{
12281227
while (*format != '\0') {
12291228
if (*format == 'd') {

features/cellular/framework/AT/ATHandler.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include "PlatformMutex.h"
2525
#include "nsapi_types.h"
2626

27-
#include "PlatformMutex.h"
2827
#include "Callback.h"
28+
2929
#include <cstdarg>
3030

3131
namespace mbed {
@@ -549,7 +549,7 @@ class ATHandler {
549549

550550
private:
551551
//Handles the arguments from given variadic list
552-
void handle_args(const char *format, va_list list);
552+
void handle_args(const char *format, std::va_list list);
553553

554554
//Starts an AT command based on given parameters
555555
void handle_start(const char *cmd, const char *cmd_chr);

features/nanostack/nanostack-interface/Nanostack.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class Nanostack : public OnboardNetworkStack, private mbed::NonCopyable<Nanostac
275275
* @param func Callback to be called
276276
* @return 0 on success, negative error code on failure
277277
*/
278-
nsapi_error_t call_in(int delay, mbed::Callback<void()> func);
278+
virtual nsapi_error_t call_in(int delay, mbed::Callback<void()> func);
279279

280280
struct nanostack_callback {
281281
mbed::Callback<void()> callback;

0 commit comments

Comments
 (0)