Skip to content

ONME-3113: Fix GCC_ARM and ARM compiler warnings from mbed-mesh-api #4738

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

Merged
merged 1 commit into from
Jul 27, 2017
Merged

ONME-3113: Fix GCC_ARM and ARM compiler warnings from mbed-mesh-api #4738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ class LoWPANNDInterface : public MeshInterfaceNanostack {
LoWPANNDInterface(NanostackRfPhy *phy) : MeshInterfaceNanostack(phy) { }

nsapi_error_t initialize(NanostackRfPhy *phy);
int connect();
int disconnect();
bool getOwnIpAddress(char *address, int8_t len);
virtual int connect();
virtual int disconnect();
virtual bool getOwnIpAddress(char *address, int8_t len);
bool getRouterIpAddress(char *address, int8_t len);
private:
mesh_error_t init();
Expand Down
2 changes: 1 addition & 1 deletion features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class MeshInterfaceNanostack : public MeshInterface {
*
* @return 0 on success, negative on failure
*/
virtual nsapi_error_t initialize(NanostackPhy *phy);
nsapi_error_t initialize(NanostackPhy *phy);

/** Start the interface
*
Expand Down
6 changes: 3 additions & 3 deletions ...ures/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class NanostackEthernetInterface : public MeshInterfaceNanostack {
NanostackEthernetInterface(NanostackEthernetPhy *phy) : MeshInterfaceNanostack(phy) { }

nsapi_error_t initialize(NanostackEthernetPhy *phy);
int connect();
int disconnect();
bool getOwnIpAddress(char *address, int8_t len);
virtual int connect();
virtual int disconnect();
virtual bool getOwnIpAddress(char *address, int8_t len);
bool getRouterIpAddress(char *address, int8_t len);
};

Expand Down
8 changes: 4 additions & 4 deletions features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class ThreadInterface : public MeshInterfaceNanostack {
ThreadInterface(NanostackRfPhy *phy) : MeshInterfaceNanostack(phy) { }

nsapi_error_t initialize(NanostackRfPhy *phy);
int connect();
int disconnect();
virtual int connect();
virtual int disconnect();
private:
/*
* \brief Initialization of the interface.
Expand Down Expand Up @@ -69,7 +69,7 @@ class ThreadInterface : public MeshInterfaceNanostack {
* \param len is the length of the address buffer, must be at least 40 bytes
* \return true if address is read successfully, false otherwise
*/
bool getOwnIpAddress(char *address, int8_t len);
virtual bool getOwnIpAddress(char *address, int8_t len);
};

#endif // THREADINTERFACE_H
#endif // THREADINTERFACE_H
2 changes: 1 addition & 1 deletion features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/LoWPANNDInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ bool LoWPANNDInterface::getRouterIpAddress(char *address, int8_t len)
return true;
}
return false;
}
}
2 changes: 1 addition & 1 deletion features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/enet_tasklet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ int8_t enet_tasklet_get_ip_address(char *address, int8_t len);
}
#endif

#endif // ENET_TASKLET_H
#endif // ENET_TASKLET_H
4 changes: 2 additions & 2 deletions features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ class NanostackRfPhy : public NanostackPhy {
* @return Device driver ID or a negative error
* code on failure
*/
int8_t phy_register() { return rf_register();}
virtual int8_t phy_register() { return rf_register();}

/** Unregister this physical interface
*
*/
void unregister() { rf_unregister(); }
virtual void unregister() { rf_unregister(); }
};

#endif /* NANOSTACK_RF_PHY_H_ */