| Index: net/tools/epoll_server/epoll_server.h
|
| diff --git a/net/tools/epoll_server/epoll_server.h b/net/tools/epoll_server/epoll_server.h
|
| index 8822450860073b0cad866c5d66858601d26ecdfc..e8f139664f32023b027f169db26ce45531038e45 100644
|
| --- a/net/tools/epoll_server/epoll_server.h
|
| +++ b/net/tools/epoll_server/epoll_server.h
|
| @@ -1023,17 +1023,17 @@ class EpollAlarm : public EpollAlarmCallbackInterface {
|
|
|
| // Marks the alarm as unregistered and returns 0. The return value may be
|
| // safely ignored by subclasses.
|
| - virtual int64 OnAlarm() OVERRIDE;
|
| + virtual int64 OnAlarm() override;
|
|
|
| // Marks the alarm as registered, and stores the token.
|
| virtual void OnRegistration(const EpollServer::AlarmRegToken& token,
|
| - EpollServer* eps) OVERRIDE;
|
| + EpollServer* eps) override;
|
|
|
| // Marks the alarm as unregistered.
|
| - virtual void OnUnregistration() OVERRIDE;
|
| + virtual void OnUnregistration() override;
|
|
|
| // Marks the alarm as unregistered.
|
| - virtual void OnShutdown(EpollServer* eps) OVERRIDE;
|
| + virtual void OnShutdown(EpollServer* eps) override;
|
|
|
| // If the alarm was registered, unregister it.
|
| void UnregisterIfRegistered();
|
|
|