Skip to content

Commit

Permalink
Merge pull request #10900 from TeroJaasko/armcc5_compilation_fixes
Browse files Browse the repository at this point in the history
Armcc5 compilation fixes
  • Loading branch information
0xc0170 authored Jul 1, 2019
2 parents 76f085b + bae3043 commit 6be510d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions features/cellular/framework/AT/ATHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "rtos/ThisThread.h"
#include "Kernel.h"
#include "CellularUtil.h"
#include <stdarg.h>
#include "SingletonPtr.h"

using namespace mbed;
Expand Down Expand Up @@ -1223,7 +1222,7 @@ void ATHandler::cmd_start(const char *cmd)
_cmd_start = true;
}

void ATHandler::handle_args(const char *format, va_list list)
void ATHandler::handle_args(const char *format, std::va_list list)
{
while (*format != '\0') {
if (*format == 'd') {
Expand Down
4 changes: 2 additions & 2 deletions features/cellular/framework/AT/ATHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include "PlatformMutex.h"
#include "nsapi_types.h"

#include "PlatformMutex.h"
#include "Callback.h"

#include <cstdarg>

namespace mbed {
Expand Down Expand Up @@ -549,7 +549,7 @@ class ATHandler {

private:
//Handles the arguments from given variadic list
void handle_args(const char *format, va_list list);
void handle_args(const char *format, std::va_list list);

//Starts an AT command based on given parameters
void handle_start(const char *cmd, const char *cmd_chr);
Expand Down
2 changes: 1 addition & 1 deletion features/nanostack/nanostack-interface/Nanostack.h
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class Nanostack : public OnboardNetworkStack, private mbed::NonCopyable<Nanostac
* @param func Callback to be called
* @return 0 on success, negative error code on failure
*/
nsapi_error_t call_in(int delay, mbed::Callback<void()> func);
virtual nsapi_error_t call_in(int delay, mbed::Callback<void()> func);

struct nanostack_callback {
mbed::Callback<void()> callback;
Expand Down

0 comments on commit 6be510d

Please sign in to comment.