diff options
author | dcheng <dcheng@chromium.org> | 2014-10-29 11:55:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-29 18:55:41 +0000 |
commit | 07c34a122d9ad0fc5d2a7ad0e8510482d4517148 (patch) | |
tree | 2f390236856d59f64d54b2f8d64926a7348eca7d /device/serial | |
parent | b5d6842a416e7950bc235c42bfab1065913b734d (diff) | |
download | chromium_src-07c34a122d9ad0fc5d2a7ad0e8510482d4517148.zip chromium_src-07c34a122d9ad0fc5d2a7ad0e8510482d4517148.tar.gz chromium_src-07c34a122d9ad0fc5d2a7ad0e8510482d4517148.tar.bz2 |
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
R=gdk@chromium.org
Review URL: https://codereview.chromium.org/684503002
Cr-Commit-Position: refs/heads/master@{#301893}
Diffstat (limited to 'device/serial')
-rw-r--r-- | device/serial/data_sink_unittest.cc | 4 | ||||
-rw-r--r-- | device/serial/data_source_unittest.cc | 4 | ||||
-rw-r--r-- | device/serial/serial_connection_unittest.cc | 2 | ||||
-rw-r--r-- | device/serial/serial_device_enumerator_linux.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/device/serial/data_sink_unittest.cc b/device/serial/data_sink_unittest.cc index cc983c9..9703b51 100644 --- a/device/serial/data_sink_unittest.cc +++ b/device/serial/data_sink_unittest.cc @@ -35,7 +35,7 @@ class DataSinkTest : public testing::Test { seen_connection_error_(false), expected_event_(EVENT_NONE) {} - virtual void SetUp() override { + void SetUp() override { message_loop_.reset(new base::MessageLoop); mojo::InterfacePtr<serial::DataSink> sink_handle; sink_receiver_ = mojo::WeakBindToProxy( @@ -47,7 +47,7 @@ class DataSinkTest : public testing::Test { sender_.reset(new DataSender(sink_handle.Pass(), kBufferSize, kFatalError)); } - virtual void TearDown() override { + void TearDown() override { read_buffer_.reset(); message_loop_.reset(); if (sink_receiver_.get()) diff --git a/device/serial/data_source_unittest.cc b/device/serial/data_source_unittest.cc index 7e4d820..7dee587 100644 --- a/device/serial/data_source_unittest.cc +++ b/device/serial/data_source_unittest.cc @@ -28,7 +28,7 @@ class DataSourceTest : public testing::Test { DataSourceTest() : error_(0), seen_connection_error_(false), expected_event_(EVENT_NONE) {} - virtual void SetUp() override { + void SetUp() override { message_loop_.reset(new base::MessageLoop); mojo::InterfacePtr<serial::DataSource> source_sender_handle; source_sender_ = mojo::WeakBindToProxy( @@ -39,7 +39,7 @@ class DataSourceTest : public testing::Test { receiver_ = new DataReceiver(source_sender_handle.Pass(), 100, kFatalError); } - virtual void TearDown() override { + void TearDown() override { write_buffer_.reset(); buffer_.reset(); message_loop_.reset(); diff --git a/device/serial/serial_connection_unittest.cc b/device/serial/serial_connection_unittest.cc index a84c9e4..9edec43 100644 --- a/device/serial/serial_connection_unittest.cc +++ b/device/serial/serial_connection_unittest.cc @@ -62,7 +62,7 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler { receive_error_(serial::RECEIVE_ERROR_NONE), expected_event_(EVENT_NONE) {} - virtual void SetUp() override { + void SetUp() override { message_loop_.reset(new base::MessageLoop); mojo::InterfacePtr<serial::SerialService> service; mojo::BindToProxy( diff --git a/device/serial/serial_device_enumerator_linux.h b/device/serial/serial_device_enumerator_linux.h index fe3c3b8..edd8a5d 100644 --- a/device/serial/serial_device_enumerator_linux.h +++ b/device/serial/serial_device_enumerator_linux.h @@ -14,10 +14,10 @@ namespace device { class SerialDeviceEnumeratorLinux : public SerialDeviceEnumerator { public: SerialDeviceEnumeratorLinux(); - virtual ~SerialDeviceEnumeratorLinux(); + ~SerialDeviceEnumeratorLinux() override; // Implementation for SerialDeviceEnumerator. - virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override; + mojo::Array<serial::DeviceInfoPtr> GetDevices() override; private: ScopedUdevPtr udev_; |