[glibmm] C++11: Replace virtual keyword with override keyword on destructors.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] C++11: Replace virtual keyword with override keyword on destructors.
- Date: Thu, 24 Dec 2015 12:00:57 +0000 (UTC)
commit 906262d82e3cdcfcd3af3a2d431458eae2d4b740
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Dec 24 12:14:08 2015 +0100
C++11: Replace virtual keyword with override keyword on destructors.
This ensures that the base class is really virtual.
gio/giomm/socketsource.h | 2 +-
glib/glibmm/error.h | 2 +-
glib/glibmm/interface.h | 2 +-
glib/glibmm/main.h | 6 +++---
glib/glibmm/object.h | 2 +-
glib/glibmm/streamiochannel.h | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gio/giomm/socketsource.h b/gio/giomm/socketsource.h
index 826dca5..2d60af5 100644
--- a/gio/giomm/socketsource.h
+++ b/gio/giomm/socketsource.h
@@ -108,7 +108,7 @@ public:
protected:
SocketSource(const Glib::RefPtr<Socket>& socket, Glib::IOCondition condition,
const Glib::RefPtr<Cancellable>& cancellable);
- virtual ~SocketSource() noexcept;
+ ~SocketSource() noexcept override;
};
} // namespace Gio
diff --git a/glib/glibmm/error.h b/glib/glibmm/error.h
index c9758ab..ab0317b 100644
--- a/glib/glibmm/error.h
+++ b/glib/glibmm/error.h
@@ -38,7 +38,7 @@ public:
Error(const Error& other);
Error& operator=(const Error& other);
- virtual ~Error() noexcept;
+ ~Error() noexcept override;
GQuark domain() const;
int code() const;
diff --git a/glib/glibmm/interface.h b/glib/glibmm/interface.h
index f7cd864..b6bafa7 100644
--- a/glib/glibmm/interface.h
+++ b/glib/glibmm/interface.h
@@ -63,7 +63,7 @@ public:
* if necessary.
*/
explicit Interface(GObject* castitem);
- virtual ~Interface() noexcept;
+ ~Interface() noexcept override;
// noncopyable
Interface(const Interface&) = delete;
diff --git a/glib/glibmm/main.h b/glib/glibmm/main.h
index 47ce0dc..f92e6f2 100644
--- a/glib/glibmm/main.h
+++ b/glib/glibmm/main.h
@@ -821,7 +821,7 @@ public:
protected:
explicit TimeoutSource(unsigned int interval);
- virtual ~TimeoutSource() noexcept;
+ ~TimeoutSource() noexcept override;
bool prepare(int& timeout) override;
bool check() override;
@@ -845,7 +845,7 @@ public:
protected:
IdleSource();
- virtual ~IdleSource() noexcept;
+ ~IdleSource() noexcept override;
bool prepare(int& timeout) override;
bool check() override;
@@ -873,7 +873,7 @@ protected:
*/
IOSource(GSource* cast_item, GSourceFunc callback_func);
- virtual ~IOSource() noexcept;
+ ~IOSource() noexcept override;
bool prepare(int& timeout) override;
bool check() override;
diff --git a/glib/glibmm/object.h b/glib/glibmm/object.h
index 0ab2b78..566780b 100644
--- a/glib/glibmm/object.h
+++ b/glib/glibmm/object.h
@@ -113,7 +113,7 @@ protected:
Object(); //For use by C++-only sub-types.
explicit Object(const Glib::ConstructParams& construct_params);
explicit Object(GObject* castitem);
- virtual ~Object() noexcept; //It should only be deleted by the callback.
+ ~Object() noexcept override; //It should only be deleted by the callback.
public:
//static RefPtr<Object> create(); //You must reimplement this in each derived class.
diff --git a/glib/glibmm/streamiochannel.h b/glib/glibmm/streamiochannel.h
index 8b6f98c..bcadc87 100644
--- a/glib/glibmm/streamiochannel.h
+++ b/glib/glibmm/streamiochannel.h
@@ -34,7 +34,7 @@ namespace Glib
class StreamIOChannel : public Glib::IOChannel
{
public:
- virtual ~StreamIOChannel() noexcept;
+ ~StreamIOChannel() noexcept override;
static Glib::RefPtr<StreamIOChannel> create(std::istream& stream);
static Glib::RefPtr<StreamIOChannel> create(std::ostream& stream);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]