Bug 1774 - Fix destructor resolution issue in GCC
authorPeter Fordham <peter.fordham@gmail.com>
Fri, 05 Mar 2010 16:54:04 -0800
changeset 15 5325df355191
parent 11 1d095efe60a1
child 16 bea8e7dfa800
Bug 1774 - Fix destructor resolution issue in GCC
usbengines/usbdevcon/inc/cusbdevcon.h
usbengines/usbdevcon/src/cusbdevcon.cpp
--- a/usbengines/usbdevcon/inc/cusbdevcon.h	Mon Feb 08 14:53:32 2010 +0000
+++ b/usbengines/usbdevcon/inc/cusbdevcon.h	Fri Mar 05 16:54:04 2010 -0800
@@ -136,6 +136,8 @@
      */ 
      TInt RunError( TInt /*aError*/ );
 
+    void Destroy();
+
 private: // data
 
     /**
--- a/usbengines/usbdevcon/src/cusbdevcon.cpp	Mon Feb 08 14:53:32 2010 +0000
+++ b/usbengines/usbdevcon/src/cusbdevcon.cpp	Fri Mar 05 16:54:04 2010 -0800
@@ -114,7 +114,7 @@
 // Destruction
 // ---------------------------------------------------------------------------
 //
-CUsbDevCon::~CUsbDevCon()
+void CUsbDevCon::Destroy()
     {
         FLOG( _L( "[USBDEVCON]\tCUsbDevCon::~CUsbDevCon" ) );
         
@@ -152,6 +152,11 @@
     
     }   
 
+CUsbDevCon::~CUsbDevCon()
+    {
+       Destroy();
+    }
+
 // ---------------------------------------------------------------------------
 // Acts accordingly to USB state
 // ---------------------------------------------------------------------------
@@ -261,7 +266,7 @@
         FLOG( _L( "[USBDEVCON]\tCUsbDevCon::RunL Exiting usbdevcon" ) );      
         
         // Shutdown timer is finished, exit program
-        CUsbDevCon:: ~CUsbDevCon(); // destruct resources
+        Destroy(); // destruct resources
         User::Exit(KErrNone);
         }
     }