Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Armcc5 compilation fixes #10900

Merged
merged 2 commits into from
Jul 1, 2019
Merged

Armcc5 compilation fixes #10900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14bb439
nanostack: silence compiler warnings for implicit virtual call_in
TeroJaasko Jun 26, 2019
bae3043
cellular: AT: fix build on ARMCC5
TeroJaasko Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions features/cellular/framework/AT/ATHandler.cpp
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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