| Index: net/tools/flip_server/sm_connection.h
|
| diff --git a/net/tools/flip_server/sm_connection.h b/net/tools/flip_server/sm_connection.h
|
| index 2fe3228c0a1671e4378e45b765a80dad176b904a..5c5a5fddb54b30913dab7f9575019f63f0a68387 100644
|
| --- a/net/tools/flip_server/sm_connection.h
|
| +++ b/net/tools/flip_server/sm_connection.h
|
| @@ -57,10 +57,10 @@ class SMConnection : public SMConnectionInterface,
|
| std::string server_ip_;
|
| std::string server_port_;
|
|
|
| - virtual EpollServer* epoll_server() OVERRIDE;
|
| + virtual EpollServer* epoll_server() override;
|
| OutputList* output_list() { return &output_list_; }
|
| MemoryCache* memory_cache() { return memory_cache_; }
|
| - virtual void ReadyToSend() OVERRIDE;
|
| + virtual void ReadyToSend() override;
|
| void EnqueueDataFrame(DataFrame* df);
|
|
|
| int fd() const { return fd_; }
|
| @@ -84,14 +84,14 @@ class SMConnection : public SMConnectionInterface,
|
| // EpollCallbackInterface interface.
|
| virtual void OnRegistration(EpollServer* eps,
|
| int fd,
|
| - int event_mask) OVERRIDE;
|
| - virtual void OnModification(int fd, int event_mask) OVERRIDE {}
|
| - virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE;
|
| - virtual void OnUnregistration(int fd, bool replaced) OVERRIDE;
|
| - virtual void OnShutdown(EpollServer* eps, int fd) OVERRIDE;
|
| + int event_mask) override;
|
| + virtual void OnModification(int fd, int event_mask) override {}
|
| + virtual void OnEvent(int fd, EpollEvent* event) override;
|
| + virtual void OnUnregistration(int fd, bool replaced) override;
|
| + virtual void OnShutdown(EpollServer* eps, int fd) override;
|
|
|
| // NotifierInterface interface.
|
| - virtual void Notify() OVERRIDE {}
|
| + virtual void Notify() override {}
|
|
|
| void Cleanup(const char* cleanup);
|
|
|
|
|