From 52ee61e1aefcd0ea009bd8475e0daefeb36272ee Mon Sep 17 00:00:00 2001
From: Ari Parkkila <ari.parkkila@arm.com>
Date: Mon, 28 Jan 2019 03:27:10 -0800
Subject: [PATCH] Fix NetworkInterface::set_default_parameters binary
 compatibility

---
 features/netsocket/CellularBase.h     | 23 ++++++++++++-----------
 features/netsocket/NetworkInterface.h | 23 ++++++++++++-----------
 features/netsocket/WiFiInterface.h    | 23 ++++++++++++-----------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/features/netsocket/CellularBase.h b/features/netsocket/CellularBase.h
index ac4c8cea6a..565d0918b0 100644
--- a/features/netsocket/CellularBase.h
+++ b/features/netsocket/CellularBase.h
@@ -39,17 +39,6 @@ public:
      */
     static CellularBase *get_default_instance();
 
-    /** Set default parameters on a cellular interface.
-     *
-     * A cellular interface instantiated directly or using
-     * CellularBase::get_default_instance() is initially unconfigured.
-     * This call can be used to set the default parameters that would
-     * have been set if the interface had been requested using
-     * NetworkInterface::get_default_instance() (see nsapi JSON
-     * configuration).
-     */
-    virtual void set_default_parameters();
-
     /** Set the cellular network credentials.
      *
      *  Please check documentation of connect() for default behavior of APN settings.
@@ -148,6 +137,18 @@ protected:
     static CellularBase *get_target_default_instance();
 
 #endif //!defined(DOXYGEN_ONLY)
+
+public:
+    /** Set default parameters on a cellular interface.
+     *
+     * A cellular interface instantiated directly or using
+     * CellularBase::get_default_instance() is initially unconfigured.
+     * This call can be used to set the default parameters that would
+     * have been set if the interface had been requested using
+     * NetworkInterface::get_default_instance() (see nsapi JSON
+     * configuration).
+     */
+    virtual void set_default_parameters();
 };
 
 #endif //CELLULAR_BASE_H
diff --git a/features/netsocket/NetworkInterface.h b/features/netsocket/NetworkInterface.h
index 87e198a6c7..aeb7874b4b 100644
--- a/features/netsocket/NetworkInterface.h
+++ b/features/netsocket/NetworkInterface.h
@@ -84,17 +84,6 @@ public:
      */
     static NetworkInterface *get_default_instance();
 
-    /** Set default parameters on an interface.
-     *
-     * A network interface instantiated directly or using calls such as
-     * WiFiInterface::get_default_instance() is initially unconfigured.
-     * This call can be used to set the default parameters that would
-     * have been set if the interface had been requested using
-     * NetworkInterface::get_default_instance() (see nsapi JSON
-     * configuration).
-     */
-    virtual void set_default_parameters();
-
     /** Get the local MAC address.
      *
      *  Provided MAC address is intended for info or debug purposes and
@@ -359,6 +348,18 @@ protected:
      */
     static NetworkInterface *get_target_default_instance();
 #endif //!defined(DOXYGEN_ONLY)
+
+public:
+    /** Set default parameters on an interface.
+     *
+     * A network interface instantiated directly or using calls such as
+     * WiFiInterface::get_default_instance() is initially unconfigured.
+     * This call can be used to set the default parameters that would
+     * have been set if the interface had been requested using
+     * NetworkInterface::get_default_instance() (see nsapi JSON
+     * configuration).
+     */
+    virtual void set_default_parameters();
 };
 
 #endif
diff --git a/features/netsocket/WiFiInterface.h b/features/netsocket/WiFiInterface.h
index ea976803ff..4a3ed9cea6 100644
--- a/features/netsocket/WiFiInterface.h
+++ b/features/netsocket/WiFiInterface.h
@@ -40,17 +40,6 @@ public:
      */
     static WiFiInterface *get_default_instance();
 
-    /** Set default parameters on a Wi-Fi interface.
-     *
-     * A Wi-Fi interface instantiated directly or using
-     * WiFiInterface::get_default_instance() is initially unconfigured.
-     * This call can be used to set the default parameters that would
-     * have been set if the interface had been requested using
-     * NetworkInterface::get_default_instance() (see nsapi JSON
-     * configuration).
-     */
-    virtual void set_default_parameters();
-
     /** Set the Wi-Fi network credentials.
      *
      *  @param ssid      Name of the network to connect to.
@@ -134,6 +123,18 @@ protected:
      */
     static WiFiInterface *get_target_default_instance();
 #endif //!defined(DOXYGEN_ONLY)
+
+public:
+    /** Set default parameters on a Wi-Fi interface.
+     *
+     * A Wi-Fi interface instantiated directly or using
+     * WiFiInterface::get_default_instance() is initially unconfigured.
+     * This call can be used to set the default parameters that would
+     * have been set if the interface had been requested using
+     * NetworkInterface::get_default_instance() (see nsapi JSON
+     * configuration).
+     */
+    virtual void set_default_parameters();
 };
 
 #endif