From 9f7fd1fbfb0e351d42657b1094c34b0f2233ef6c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Dec 2014 14:29:26 +0100 Subject: [PATCH] db/lazy, input/mms: add "override" keywords Fixes -Winconsistent-missing-override (clang 3.6). --- src/db/plugins/LazyDatabase.hxx | 2 +- src/db/plugins/upnp/UpnpDatabasePlugin.cxx | 6 ++++-- src/input/plugins/MmsInputPlugin.cxx | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/db/plugins/LazyDatabase.hxx b/src/db/plugins/LazyDatabase.hxx index ae1b961d0..38b3fdc2a 100644 --- a/src/db/plugins/LazyDatabase.hxx +++ b/src/db/plugins/LazyDatabase.hxx @@ -43,7 +43,7 @@ public: virtual const LightSong *GetSong(const char *uri_utf8, Error &error) const override; - virtual void ReturnSong(const LightSong *song) const; + void ReturnSong(const LightSong *song) const override; virtual bool Visit(const DatabaseSelection &selection, VisitDirectory visit_directory, diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx index 21ddb8790..9970cdcf3 100644 --- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx +++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx @@ -85,7 +85,7 @@ public: virtual void Close() override; virtual const LightSong *GetSong(const char *uri_utf8, Error &error) const override; - virtual void ReturnSong(const LightSong *song) const; + void ReturnSong(const LightSong *song) const override; virtual bool Visit(const DatabaseSelection &selection, VisitDirectory visit_directory, @@ -101,7 +101,9 @@ public: virtual bool GetStats(const DatabaseSelection &selection, DatabaseStats &stats, Error &error) const override; - virtual time_t GetUpdateStamp() const {return 0;} + time_t GetUpdateStamp() const override { + return 0; + } protected: bool Configure(const config_param ¶m, Error &error); diff --git a/src/input/plugins/MmsInputPlugin.cxx b/src/input/plugins/MmsInputPlugin.cxx index df291bc84..d01cff3b3 100644 --- a/src/input/plugins/MmsInputPlugin.cxx +++ b/src/input/plugins/MmsInputPlugin.cxx @@ -43,7 +43,7 @@ protected: virtual size_t ThreadRead(void *ptr, size_t size, Error &error) override; - virtual void Close() { + void Close() override { mmsx_close(mms); } };