# HG changeset patch # User Peter Fordham # Date 1267836844 28800 # Node ID 5325df355191ebd349893dc5732eb12a5bee673c # Parent 1d095efe60a1d8ab82b59e8b765e3cb3706015c7 Bug 1774 - Fix destructor resolution issue in GCC diff -r 1d095efe60a1 -r 5325df355191 usbengines/usbdevcon/inc/cusbdevcon.h --- 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 /** diff -r 1d095efe60a1 -r 5325df355191 usbengines/usbdevcon/src/cusbdevcon.cpp --- 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); } }