summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Cheng <dcheng@chromium.org>2018-04-27 10:59:34 +0900
committerQijiang Fan <fqj@google.com>2020-06-05 09:11:59 +0900
commitabf1057a33087aec846d628f8033a1fd3f867162 (patch)
tree49791513f117beb0b166ec06482507852c28f2e3
parent6418801e05c944ea4c3e5541a9aec64a2cd84d0f (diff)
downloadlibchrome-abf1057a33087aec846d628f8033a1fd3f867162.tar.gz
Chrome style plugin: enable virtual specifier checks for Gmock objects in //dbus.
Previously, the plugin completely skipped virtual specifier checks on Gmock objects since it wasn't smart enough to filter out warnings caused by Gmock macros. In preparation for making the plugin smarter, this CL fixes existing virtual specifier warnings in //dbus. This CL was uploaded by git cl split. R=stevenjb@chromium.org Bug: 837148 Change-Id: I2af67226ab01879be81437c2bcf6a2e5e6002987 Reviewed-on: https://chromium-review.googlesource.com/1031184 Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Commit-Queue: Daniel Cheng <dcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#554265} CrOS-Libchrome-Original-Commit: 3ea6cb7c2e95f3c6660922410b5407e837f8007e
-rw-r--r--dbus/mock_bus.h2
-rw-r--r--dbus/mock_exported_object.h2
-rw-r--r--dbus/mock_object_manager.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/dbus/mock_bus.h b/dbus/mock_bus.h
index 40b090b156..37b31b0905 100644
--- a/dbus/mock_bus.h
+++ b/dbus/mock_bus.h
@@ -68,7 +68,7 @@ class MockBus : public Bus {
MOCK_METHOD0(AssertOnDBusThread, void());
protected:
- virtual ~MockBus();
+ ~MockBus() override;
};
} // namespace dbus
diff --git a/dbus/mock_exported_object.h b/dbus/mock_exported_object.h
index 80ca9512ff..99c363f9b5 100644
--- a/dbus/mock_exported_object.h
+++ b/dbus/mock_exported_object.h
@@ -32,7 +32,7 @@ class MockExportedObject : public ExportedObject {
MOCK_METHOD0(Unregister, void());
protected:
- virtual ~MockExportedObject();
+ ~MockExportedObject() override;
};
} // namespace dbus
diff --git a/dbus/mock_object_manager.h b/dbus/mock_object_manager.h
index 2318e497ea..6eb95de9a4 100644
--- a/dbus/mock_object_manager.h
+++ b/dbus/mock_object_manager.h
@@ -33,7 +33,7 @@ class MockObjectManager : public ObjectManager {
const std::string&));
protected:
- virtual ~MockObjectManager();
+ ~MockObjectManager() override;
};
} // namespace dbus