diff options
| author | Yunlian Jiang <yunlian@google.com> | 2015-01-30 08:36:10 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-30 23:04:26 +0000 |
| commit | 6acd966cabe0d75e0d9ae3f84c727c9b44a899b3 (patch) | |
| tree | 5c2c73fe853a6e4c57f92e8bc8c2795bc20f41b1 /dbus_properties_proxy.h | |
| parent | a44356e9b9a70fd32ba9351731e8df7857c4395d (diff) | |
| download | shill-6acd966cabe0d75e0d9ae3f84c727c9b44a899b3.tar.gz | |
shill: fix -Winconsistent-missing-override warning found by clang.
This cleans up the warning '-Winconsistent-missing-override'.
BUG=chromium:453588
TEST=USE='vpn wimax cellular' FEATURES="test" emerge-amd64-generic shill
Change-Id: I39056b312f616eccc916bce7fb6ad8ab8ca6ca55
Reviewed-on: https://chromium-review.googlesource.com/244692
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Diffstat (limited to 'dbus_properties_proxy.h')
| -rw-r--r-- | dbus_properties_proxy.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/dbus_properties_proxy.h b/dbus_properties_proxy.h index ee733a96..0f5b9384 100644 --- a/dbus_properties_proxy.h +++ b/dbus_properties_proxy.h @@ -23,14 +23,14 @@ class DBusPropertiesProxy : public DBusPropertiesProxyInterface { ~DBusPropertiesProxy() override; // Inherited from DBusPropertiesProxyInterface. - virtual DBusPropertiesMap GetAll(const std::string &interface_name); - virtual DBus::Variant Get(const std::string &interface_name, - const std::string &property); + DBusPropertiesMap GetAll(const std::string &interface_name) override; + DBus::Variant Get(const std::string &interface_name, + const std::string &property) override; - virtual void set_properties_changed_callback( - const PropertiesChangedCallback &callback); - virtual void set_modem_manager_properties_changed_callback( - const ModemManagerPropertiesChangedCallback &callback); + void set_properties_changed_callback( + const PropertiesChangedCallback &callback) override; + void set_modem_manager_properties_changed_callback( + const ModemManagerPropertiesChangedCallback &callback) override; private: class Proxy : public org::freedesktop::DBus::Properties_proxy, @@ -48,13 +48,13 @@ class DBusPropertiesProxy : public DBusPropertiesProxyInterface { private: // Signal callbacks inherited from DBusProperties_proxy. - virtual void MmPropertiesChanged(const std::string &interface, - const DBusPropertiesMap &properties); + void MmPropertiesChanged(const std::string &interface, + const DBusPropertiesMap &properties) override; - virtual void PropertiesChanged( + void PropertiesChanged( const std::string &interface, const DBusPropertiesMap &changed_properties, - const std::vector<std::string> &invalidated_properties); + const std::vector<std::string> &invalidated_properties) override; PropertiesChangedCallback properties_changed_callback_; ModemManagerPropertiesChangedCallback mm_properties_changed_callback_; |