| Index: device/serial/serial_io_handler_posix.h
|
| diff --git a/device/serial/serial_io_handler_posix.h b/device/serial/serial_io_handler_posix.h
|
| index a35842ce74b1b5434957fde681dda8d7c7c94f81..ef4bd377b321a47febb45c567a1e5b735cf483f1 100644
|
| --- a/device/serial/serial_io_handler_posix.h
|
| +++ b/device/serial/serial_io_handler_posix.h
|
| @@ -14,17 +14,17 @@ class SerialIoHandlerPosix : public SerialIoHandler,
|
| public base::MessageLoopForIO::Watcher {
|
| protected:
|
| // SerialIoHandler impl.
|
| - virtual void ReadImpl() OVERRIDE;
|
| - virtual void WriteImpl() OVERRIDE;
|
| - virtual void CancelReadImpl() OVERRIDE;
|
| - virtual void CancelWriteImpl() OVERRIDE;
|
| - virtual bool Flush() const OVERRIDE;
|
| - virtual serial::DeviceControlSignalsPtr GetControlSignals() const OVERRIDE;
|
| + virtual void ReadImpl() override;
|
| + virtual void WriteImpl() override;
|
| + virtual void CancelReadImpl() override;
|
| + virtual void CancelWriteImpl() override;
|
| + virtual bool Flush() const override;
|
| + virtual serial::DeviceControlSignalsPtr GetControlSignals() const override;
|
| virtual bool SetControlSignals(
|
| - const serial::HostControlSignals& control_signals) OVERRIDE;
|
| - virtual bool ConfigurePort(const serial::ConnectionOptions& options) OVERRIDE;
|
| - virtual serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE;
|
| - virtual bool PostOpen() OVERRIDE;
|
| + const serial::HostControlSignals& control_signals) override;
|
| + virtual bool ConfigurePort(const serial::ConnectionOptions& options) override;
|
| + virtual serial::ConnectionInfoPtr GetPortInfo() const override;
|
| + virtual bool PostOpen() override;
|
|
|
| private:
|
| friend class SerialIoHandler;
|
| @@ -34,8 +34,8 @@ class SerialIoHandlerPosix : public SerialIoHandler,
|
| virtual ~SerialIoHandlerPosix();
|
|
|
| // base::MessageLoopForIO::Watcher implementation.
|
| - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
|
| - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
|
| + virtual void OnFileCanWriteWithoutBlocking(int fd) override;
|
| + virtual void OnFileCanReadWithoutBlocking(int fd) override;
|
|
|
| void EnsureWatchingReads();
|
| void EnsureWatchingWrites();
|
|
|