Bug 833505: Add MOZ_FINAL annotations to calm GCC's -Wdelete-non-virtual-dtor warnings in nsGIOProtocolHandler and nsGSettingsService. blanket-r=ehsan

This commit is contained in:
Daniel Holbert 2013-01-22 11:57:09 -08:00
Родитель 91e8d627f4
Коммит 062241d0f0
3 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -135,7 +135,7 @@ static void mount_operation_ask_password (GMountOperation *mount_op,
gpointer user_data); gpointer user_data);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class nsGIOInputStream : public nsIInputStream class nsGIOInputStream MOZ_FINAL : public nsIInputStream
{ {
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
@ -880,8 +880,8 @@ mount_operation_ask_password (GMountOperation *mount_op,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class nsGIOProtocolHandler : public nsIProtocolHandler class nsGIOProtocolHandler MOZ_FINAL : public nsIProtocolHandler
, public nsIObserver , public nsIObserver
{ {
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
@ -891,7 +891,7 @@ class nsGIOProtocolHandler : public nsIProtocolHandler
nsresult Init(); nsresult Init();
private: private:
void InitSupportedProtocolsPref(nsIPrefBranch *prefs); void InitSupportedProtocolsPref(nsIPrefBranch *prefs);
bool IsSupportedProtocol(const nsCString &spec); bool IsSupportedProtocol(const nsCString &spec);
nsCString mSupportedProtocols; nsCString mSupportedProtocols;

Просмотреть файл

@ -77,7 +77,7 @@ GSETTINGS_FUNCTIONS
static PRLibrary *gioLib = nullptr; static PRLibrary *gioLib = nullptr;
class nsGSettingsCollection : public nsIGSettingsCollection class nsGSettingsCollection MOZ_FINAL : public nsIGSettingsCollection
{ {
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS

Просмотреть файл

@ -11,7 +11,7 @@
#define NS_GSETTINGSSERVICE_CID \ #define NS_GSETTINGSSERVICE_CID \
{0xbfd4a9d8, 0xd886, 0x4161, {0x81, 0xef, 0x88, 0x68, 0xda, 0x11, 0x41, 0x70}} {0xbfd4a9d8, 0xd886, 0x4161, {0x81, 0xef, 0x88, 0x68, 0xda, 0x11, 0x41, 0x70}}
class nsGSettingsService : public nsIGSettingsService class nsGSettingsService MOZ_FINAL : public nsIGSettingsService
{ {
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS