Skip to content

Commit 52ee61e

Browse files
author
Ari Parkkila
committed
Fix NetworkInterface::set_default_parameters binary compatibility
1 parent 9583966 commit 52ee61e

File tree

3 files changed

+36
-33
lines changed

3 files changed

+36
-33
lines changed

features/netsocket/CellularBase.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@ class CellularBase: public NetworkInterface {
3939
*/
4040
static CellularBase *get_default_instance();
4141

42-
/** Set default parameters on a cellular interface.
43-
*
44-
* A cellular interface instantiated directly or using
45-
* CellularBase::get_default_instance() is initially unconfigured.
46-
* This call can be used to set the default parameters that would
47-
* have been set if the interface had been requested using
48-
* NetworkInterface::get_default_instance() (see nsapi JSON
49-
* configuration).
50-
*/
51-
virtual void set_default_parameters();
52-
5342
/** Set the cellular network credentials.
5443
*
5544
* Please check documentation of connect() for default behavior of APN settings.
@@ -148,6 +137,18 @@ class CellularBase: public NetworkInterface {
148137
static CellularBase *get_target_default_instance();
149138

150139
#endif //!defined(DOXYGEN_ONLY)
140+
141+
public:
142+
/** Set default parameters on a cellular interface.
143+
*
144+
* A cellular interface instantiated directly or using
145+
* CellularBase::get_default_instance() is initially unconfigured.
146+
* This call can be used to set the default parameters that would
147+
* have been set if the interface had been requested using
148+
* NetworkInterface::get_default_instance() (see nsapi JSON
149+
* configuration).
150+
*/
151+
virtual void set_default_parameters();
151152
};
152153

153154
#endif //CELLULAR_BASE_H

features/netsocket/NetworkInterface.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,6 @@ class NetworkInterface: public DNS {
8484
*/
8585
static NetworkInterface *get_default_instance();
8686

87-
/** Set default parameters on an interface.
88-
*
89-
* A network interface instantiated directly or using calls such as
90-
* WiFiInterface::get_default_instance() is initially unconfigured.
91-
* This call can be used to set the default parameters that would
92-
* have been set if the interface had been requested using
93-
* NetworkInterface::get_default_instance() (see nsapi JSON
94-
* configuration).
95-
*/
96-
virtual void set_default_parameters();
97-
9887
/** Get the local MAC address.
9988
*
10089
* Provided MAC address is intended for info or debug purposes and
@@ -359,6 +348,18 @@ class NetworkInterface: public DNS {
359348
*/
360349
static NetworkInterface *get_target_default_instance();
361350
#endif //!defined(DOXYGEN_ONLY)
351+
352+
public:
353+
/** Set default parameters on an interface.
354+
*
355+
* A network interface instantiated directly or using calls such as
356+
* WiFiInterface::get_default_instance() is initially unconfigured.
357+
* This call can be used to set the default parameters that would
358+
* have been set if the interface had been requested using
359+
* NetworkInterface::get_default_instance() (see nsapi JSON
360+
* configuration).
361+
*/
362+
virtual void set_default_parameters();
362363
};
363364

364365
#endif

features/netsocket/WiFiInterface.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,6 @@ class WiFiInterface: public virtual NetworkInterface {
4040
*/
4141
static WiFiInterface *get_default_instance();
4242

43-
/** Set default parameters on a Wi-Fi interface.
44-
*
45-
* A Wi-Fi interface instantiated directly or using
46-
* WiFiInterface::get_default_instance() is initially unconfigured.
47-
* This call can be used to set the default parameters that would
48-
* have been set if the interface had been requested using
49-
* NetworkInterface::get_default_instance() (see nsapi JSON
50-
* configuration).
51-
*/
52-
virtual void set_default_parameters();
53-
5443
/** Set the Wi-Fi network credentials.
5544
*
5645
* @param ssid Name of the network to connect to.
@@ -134,6 +123,18 @@ class WiFiInterface: public virtual NetworkInterface {
134123
*/
135124
static WiFiInterface *get_target_default_instance();
136125
#endif //!defined(DOXYGEN_ONLY)
126+
127+
public:
128+
/** Set default parameters on a Wi-Fi interface.
129+
*
130+
* A Wi-Fi interface instantiated directly or using
131+
* WiFiInterface::get_default_instance() is initially unconfigured.
132+
* This call can be used to set the default parameters that would
133+
* have been set if the interface had been requested using
134+
* NetworkInterface::get_default_instance() (see nsapi JSON
135+
* configuration).
136+
*/
137+
virtual void set_default_parameters();
137138
};
138139

139140
#endif

0 commit comments

Comments
 (0)