Prevent problem with static instance destructors

Change-Id: I8f28ed7129c72bd9df5a4015565c0be0518413cc
Signed-off-by: Jaehwan Lee <jh8379.lee@samsung.com>

diff --git a/src/inc/FNetWifi_WifiProximityManagerImpl.h b/src/inc/FNetWifi_WifiProximityManagerImpl.h
index 8b13689..067f335 100644 (file)
--- a/src/inc/FNetWifi_WifiProximityManagerImpl.h
+++ b/src/inc/FNetWifi_WifiProximityManagerImpl.h
@@ -170,11 +170,6 @@ private:
      */
     static void InitSingleton(void);
 
-    /**
-     * Destorys instance of singleton class.
-     */
-    static void DestroySingleton(void);
-
 private:
     Tizen::Base::Collection::HashMapT<_IWifiProximityEventListener*, bool>* __pListenerStateMap;
     Tizen::Base::Collection::MultiHashMapT<Tizen::Base::String, _IWifiProximityEventListener*>* __pBssListenerMap;

diff --git a/src/wifi/FNetWifi_WifiIpcProxy.cpp b/src/wifi/FNetWifi_WifiIpcProxy.cpp
index 03c2293..5bdf21e 100644 (file)
--- a/src/wifi/FNetWifi_WifiIpcProxy.cpp
+++ b/src/wifi/FNetWifi_WifiIpcProxy.cpp
@@ -80,14 +80,6 @@ _WifiIpcProxy::InitSingleton(void)
     SysTryReturnVoidResult(NID_NET_WIFI, r == E_SUCCESS, r, "[%s] Construction of the _WifiIpcProxy has failed.", GetErrorMessage(r));
 
     pSingleton = pInst.release();
-
-    std::atexit(DestroySingleton);
-}
-
-void 
-_WifiIpcProxy::DestroySingleton(void)
-{
-    delete pSingleton;
 }
 
 _WifiIpcProxy*

diff --git a/src/wifi/FNetWifi_WifiIpcProxy.h b/src/wifi/FNetWifi_WifiIpcProxy.h
index db247f1..7e14eeb 100644 (file)
--- a/src/wifi/FNetWifi_WifiIpcProxy.h
+++ b/src/wifi/FNetWifi_WifiIpcProxy.h
@@ -190,12 +190,6 @@ private:
      */
     static void InitSingleton(void);
 
-    /**
-     * Destorys instance of singleton class.
-     *
-     */
-    static void DestroySingleton(void);
-
 private:
        Tizen::Io::_IpcClient* __pIpcClient;
     friend class std::default_delete<_WifiIpcProxy>;

diff --git a/src/wifi/FNetWifi_WifiProximityManagerImpl.cpp b/src/wifi/FNetWifi_WifiProximityManagerImpl.cpp
index e207817..cffcf80 100644 (file)
--- a/src/wifi/FNetWifi_WifiProximityManagerImpl.cpp
+++ b/src/wifi/FNetWifi_WifiProximityManagerImpl.cpp
@@ -81,13 +81,6 @@ _WifiProximityManagerImpl::InitSingleton(void)
     SysTryReturnVoidResult(NID_NET_WIFI, r == E_SUCCESS, r, "[%s] Construct() of the singleton has failed.", GetErrorMessage(r));
 
     __pWifiProximityManagerImpl = pInst.release();
-    std::atexit(DestroySingleton);
-}
-
-void
-_WifiProximityManagerImpl::DestroySingleton(void)
-{
-    delete __pWifiProximityManagerImpl;
 }
 
 _WifiProximityManagerImpl::_WifiProximityManagerImpl(void)