Skip to content

Commit 3f52924

Browse files
Merge pull request #4738 from SeppoTakalo/compile_warnings
ONME-3113: Fix GCC_ARM and ARM compiler warnings from mbed-mesh-api
2 parents a0c9c88 + f3c7e0d commit 3f52924

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ class LoWPANNDInterface : public MeshInterfaceNanostack {
3434
LoWPANNDInterface(NanostackRfPhy *phy) : MeshInterfaceNanostack(phy) { }
3535

3636
nsapi_error_t initialize(NanostackRfPhy *phy);
37-
int connect();
38-
int disconnect();
39-
bool getOwnIpAddress(char *address, int8_t len);
37+
virtual int connect();
38+
virtual int disconnect();
39+
virtual bool getOwnIpAddress(char *address, int8_t len);
4040
bool getRouterIpAddress(char *address, int8_t len);
4141
private:
4242
mesh_error_t init();

features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class MeshInterfaceNanostack : public MeshInterface {
3232
*
3333
* @return 0 on success, negative on failure
3434
*/
35-
virtual nsapi_error_t initialize(NanostackPhy *phy);
35+
nsapi_error_t initialize(NanostackPhy *phy);
3636

3737
/** Start the interface
3838
*

features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class NanostackEthernetInterface : public MeshInterfaceNanostack {
2727
NanostackEthernetInterface(NanostackEthernetPhy *phy) : MeshInterfaceNanostack(phy) { }
2828

2929
nsapi_error_t initialize(NanostackEthernetPhy *phy);
30-
int connect();
31-
int disconnect();
32-
bool getOwnIpAddress(char *address, int8_t len);
30+
virtual int connect();
31+
virtual int disconnect();
32+
virtual bool getOwnIpAddress(char *address, int8_t len);
3333
bool getRouterIpAddress(char *address, int8_t len);
3434
};
3535

features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class ThreadInterface : public MeshInterfaceNanostack {
3434
ThreadInterface(NanostackRfPhy *phy) : MeshInterfaceNanostack(phy) { }
3535

3636
nsapi_error_t initialize(NanostackRfPhy *phy);
37-
int connect();
38-
int disconnect();
37+
virtual int connect();
38+
virtual int disconnect();
3939
private:
4040
/*
4141
* \brief Initialization of the interface.
@@ -69,7 +69,7 @@ class ThreadInterface : public MeshInterfaceNanostack {
6969
* \param len is the length of the address buffer, must be at least 40 bytes
7070
* \return true if address is read successfully, false otherwise
7171
*/
72-
bool getOwnIpAddress(char *address, int8_t len);
72+
virtual bool getOwnIpAddress(char *address, int8_t len);
7373
};
7474

75-
#endif // THREADINTERFACE_H
75+
#endif // THREADINTERFACE_H

features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/enet_tasklet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ int8_t enet_tasklet_get_ip_address(char *address, int8_t len);
3232
}
3333
#endif
3434

35-
#endif // ENET_TASKLET_H
35+
#endif // ENET_TASKLET_H

features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ class NanostackRfPhy : public NanostackPhy {
2727
* @return Device driver ID or a negative error
2828
* code on failure
2929
*/
30-
int8_t phy_register() { return rf_register();}
30+
virtual int8_t phy_register() { return rf_register();}
3131

3232
/** Unregister this physical interface
3333
*
3434
*/
35-
void unregister() { rf_unregister(); }
35+
virtual void unregister() { rf_unregister(); }
3636
};
3737

3838
#endif /* NANOSTACK_RF_PHY_H_ */

0 commit comments

Comments
 (0)