diff options
author | mostynb <mostynb@opera.com> | 2014-10-09 04:01:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 11:01:43 +0000 |
commit | ba063d6038f4e0df5188cdd46589c62388d8e06b (patch) | |
tree | 5dd4b0be08ab43875cb16ed59f4c2c281f6c7412 /net/tools/flip_server | |
parent | c239532659a8ac3422094ffbd9f90e38abe0bf48 (diff) | |
download | chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.zip chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.tar.gz chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.tar.bz2 |
replace OVERRIDE and FINAL with override and final in net/
BUG=417463
Review URL: https://codereview.chromium.org/623213004
Cr-Commit-Position: refs/heads/master@{#298844}
Diffstat (limited to 'net/tools/flip_server')
-rw-r--r-- | net/tools/flip_server/acceptor_thread.h | 14 | ||||
-rw-r--r-- | net/tools/flip_server/http_interface.h | 72 | ||||
-rw-r--r-- | net/tools/flip_server/http_interface_test.cc | 2 | ||||
-rw-r--r-- | net/tools/flip_server/mem_cache.h | 30 | ||||
-rw-r--r-- | net/tools/flip_server/mem_cache_test.cc | 2 | ||||
-rw-r--r-- | net/tools/flip_server/output_ordering.h | 8 | ||||
-rw-r--r-- | net/tools/flip_server/ring_buffer.h | 26 | ||||
-rw-r--r-- | net/tools/flip_server/sm_connection.h | 16 | ||||
-rw-r--r-- | net/tools/flip_server/spdy_interface.h | 72 | ||||
-rw-r--r-- | net/tools/flip_server/streamer_interface.h | 72 |
10 files changed, 157 insertions, 157 deletions
diff --git a/net/tools/flip_server/acceptor_thread.h b/net/tools/flip_server/acceptor_thread.h index bcaa43e..ecb4316 100644 --- a/net/tools/flip_server/acceptor_thread.h +++ b/net/tools/flip_server/acceptor_thread.h @@ -52,14 +52,14 @@ class SMAcceptorThread : public base::SimpleThread, // EpollCallbackInteface 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 {} // SMConnectionPool interface - virtual void SMConnectionDone(SMConnection* sc) OVERRIDE; + virtual void SMConnectionDone(SMConnection* sc) override; // TODO(mbelshe): figure out if we can move these to private functions. SMConnection* NewConnection(); @@ -75,7 +75,7 @@ class SMAcceptorThread : public base::SimpleThread, // idle longer than the configured timeout. void HandleConnectionIdleTimeout(); - virtual void Run() OVERRIDE; + virtual void Run() override; private: EpollServer epoll_server_; diff --git a/net/tools/flip_server/http_interface.h b/net/tools/flip_server/http_interface.h index 30b7979..08a595e 100644 --- a/net/tools/flip_server/http_interface.h +++ b/net/tools/flip_server/http_interface.h @@ -32,11 +32,11 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { private: // BalsaVisitorInterface: - virtual void ProcessBodyInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE; - virtual void ProcessHeaderInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessTrailerInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE; + virtual void ProcessBodyInput(const char* input, size_t size) override {} + virtual void ProcessBodyData(const char* input, size_t size) override; + virtual void ProcessHeaderInput(const char* input, size_t size) override {} + virtual void ProcessTrailerInput(const char* input, size_t size) override {} + virtual void ProcessHeaders(const BalsaHeaders& headers) override; virtual void ProcessRequestFirstLine(const char* line_input, size_t line_length, const char* method_input, @@ -44,7 +44,7 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { const char* request_uri_input, size_t request_uri_length, const char* version_input, - size_t version_length) OVERRIDE {} + size_t version_length) override {} virtual void ProcessResponseFirstLine(const char* line_input, size_t line_length, const char* version_input, @@ -52,28 +52,28 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { const char* status_input, size_t status_length, const char* reason_input, - size_t reason_length) OVERRIDE {} - virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {} - virtual void ProcessChunkExtensions(const char* input, size_t size) OVERRIDE { + size_t reason_length) override {} + virtual void ProcessChunkLength(size_t chunk_length) override {} + virtual void ProcessChunkExtensions(const char* input, size_t size) override { } - virtual void HeaderDone() OVERRIDE {} - virtual void MessageDone() OVERRIDE; - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE; - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {} - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE; - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE; + virtual void HeaderDone() override {} + virtual void MessageDone() override; + virtual void HandleHeaderError(BalsaFrame* framer) override; + virtual void HandleHeaderWarning(BalsaFrame* framer) override {} + virtual void HandleChunkingError(BalsaFrame* framer) override; + virtual void HandleBodyError(BalsaFrame* framer) override; void HandleError(); public: void AddToOutputOrder(const MemCacheIter& mci); BalsaFrame* spdy_framer() { return http_framer_; } - virtual void set_is_request() OVERRIDE {} + virtual void set_is_request() override {} const OutputOrdering& output_ordering() const { return output_ordering_; } // SMInterface: virtual void InitSMInterface(SMInterface* sm_spdy_interface, - int32 server_idx) OVERRIDE; + int32 server_idx) override; virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool, SMInterface* sm_interface, EpollServer* epoll_server, @@ -81,33 +81,33 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { std::string server_ip, std::string server_port, std::string remote_ip, - bool use_ssl) OVERRIDE; - virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE; - virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE; - virtual bool MessageFullyRead() const OVERRIDE; - virtual void SetStreamID(uint32 stream_id) OVERRIDE; - virtual bool Error() const OVERRIDE; - virtual const char* ErrorAsString() const OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void ResetForNewInterface(int32 server_idx) OVERRIDE {} - virtual void ResetForNewConnection() OVERRIDE; - virtual void Cleanup() OVERRIDE; - virtual int PostAcceptHook() OVERRIDE; + bool use_ssl) override; + virtual size_t ProcessReadInput(const char* data, size_t len) override; + virtual size_t ProcessWriteInput(const char* data, size_t len) override; + virtual bool MessageFullyRead() const override; + virtual void SetStreamID(uint32 stream_id) override; + virtual bool Error() const override; + virtual const char* ErrorAsString() const override; + virtual void Reset() override; + virtual void ResetForNewInterface(int32 server_idx) override {} + virtual void ResetForNewConnection() override; + virtual void Cleanup() override; + virtual int PostAcceptHook() override; virtual void NewStream(uint32 stream_id, uint32 priority, - const std::string& filename) OVERRIDE; - virtual void SendEOF(uint32 stream_id) OVERRIDE; - virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE; + const std::string& filename) override; + virtual void SendEOF(uint32 stream_id) override; + virtual void SendErrorNotFound(uint32 stream_id) override; virtual size_t SendSynStream(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual size_t SendSynReply(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len, uint32 flags, - bool compress) OVERRIDE; + bool compress) override; private: void SendEOFImpl(uint32 stream_id); @@ -121,7 +121,7 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { uint32 flags, bool compress); void EnqueueDataFrame(DataFrame* df); - virtual void GetOutput() OVERRIDE; + virtual void GetOutput() override; private: BalsaFrame* http_framer_; diff --git a/net/tools/flip_server/http_interface_test.cc b/net/tools/flip_server/http_interface_test.cc index 969607b..9e72279 100644 --- a/net/tools/flip_server/http_interface_test.cc +++ b/net/tools/flip_server/http_interface_test.cc @@ -86,7 +86,7 @@ class FlipHttpSMTest : public ::testing::Test { acceptor_.get())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (acceptor_->listen_fd_ >= 0) { epoll_server_->UnregisterFD(acceptor_->listen_fd_); close(acceptor_->listen_fd_); diff --git a/net/tools/flip_server/mem_cache.h b/net/tools/flip_server/mem_cache.h index 76ffc95..63befee 100644 --- a/net/tools/flip_server/mem_cache.h +++ b/net/tools/flip_server/mem_cache.h @@ -21,11 +21,11 @@ class StoreBodyAndHeadersVisitor : public BalsaVisitorInterface { void HandleError() { error_ = true; } // BalsaVisitorInterface: - virtual void ProcessBodyInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE; - virtual void ProcessHeaderInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessTrailerInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE { + virtual void ProcessBodyInput(const char* input, size_t size) override {} + virtual void ProcessBodyData(const char* input, size_t size) override; + virtual void ProcessHeaderInput(const char* input, size_t size) override {} + virtual void ProcessTrailerInput(const char* input, size_t size) override {} + virtual void ProcessHeaders(const BalsaHeaders& headers) override { // nothing to do here-- we're assuming that the BalsaFrame has // been handed our headers. } @@ -36,7 +36,7 @@ class StoreBodyAndHeadersVisitor : public BalsaVisitorInterface { const char* request_uri_input, size_t request_uri_length, const char* version_input, - size_t version_length) OVERRIDE {} + size_t version_length) override {} virtual void ProcessResponseFirstLine(const char* line_input, size_t line_length, const char* version_input, @@ -44,16 +44,16 @@ class StoreBodyAndHeadersVisitor : public BalsaVisitorInterface { const char* status_input, size_t status_length, const char* reason_input, - size_t reason_length) OVERRIDE {} - virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {} - virtual void ProcessChunkExtensions(const char* input, size_t size) OVERRIDE { + size_t reason_length) override {} + virtual void ProcessChunkLength(size_t chunk_length) override {} + virtual void ProcessChunkExtensions(const char* input, size_t size) override { } - virtual void HeaderDone() OVERRIDE {} - virtual void MessageDone() OVERRIDE {} - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE; - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE; - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE; - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE; + virtual void HeaderDone() override {} + virtual void MessageDone() override {} + virtual void HandleHeaderError(BalsaFrame* framer) override; + virtual void HandleHeaderWarning(BalsaFrame* framer) override; + virtual void HandleChunkingError(BalsaFrame* framer) override; + virtual void HandleBodyError(BalsaFrame* framer) override; BalsaHeaders headers; std::string body; diff --git a/net/tools/flip_server/mem_cache_test.cc b/net/tools/flip_server/mem_cache_test.cc index 5e45bb5..bb01907 100644 --- a/net/tools/flip_server/mem_cache_test.cc +++ b/net/tools/flip_server/mem_cache_test.cc @@ -16,7 +16,7 @@ class MemoryCacheWithFakeReadToString : public MemoryCache { virtual ~MemoryCacheWithFakeReadToString() {} virtual void ReadToString(const char* filename, - std::string* output) OVERRIDE { + std::string* output) override { *output = data_map_[filename]; } diff --git a/net/tools/flip_server/output_ordering.h b/net/tools/flip_server/output_ordering.h index 596f382..488d2e9 100644 --- a/net/tools/flip_server/output_ordering.h +++ b/net/tools/flip_server/output_ordering.h @@ -56,11 +56,11 @@ class OutputOrdering { virtual ~BeginOutputtingAlarm(); // EpollAlarmCallbackInterface: - virtual int64 OnAlarm() OVERRIDE; + virtual int64 OnAlarm() override; virtual void OnRegistration(const EpollServer::AlarmRegToken& tok, - EpollServer* eps) OVERRIDE; - virtual void OnUnregistration() OVERRIDE; - virtual void OnShutdown(EpollServer* eps) OVERRIDE; + EpollServer* eps) override; + virtual void OnUnregistration() override; + virtual void OnShutdown(EpollServer* eps) override; private: OutputOrdering* output_ordering_; diff --git a/net/tools/flip_server/ring_buffer.h b/net/tools/flip_server/ring_buffer.h index b129ee8..bb3b39f 100644 --- a/net/tools/flip_server/ring_buffer.h +++ b/net/tools/flip_server/ring_buffer.h @@ -38,32 +38,32 @@ class RingBuffer : public BufferInterface { // The following functions all override pure virtual functions // in BufferInterface. See buffer_interface.h for a description // of what they do if the function isn't documented here. - virtual int ReadableBytes() const OVERRIDE; - virtual int BufferSize() const OVERRIDE; - virtual int BytesFree() const OVERRIDE; + virtual int ReadableBytes() const override; + virtual int BufferSize() const override; + virtual int BytesFree() const override; - virtual bool Empty() const OVERRIDE; - virtual bool Full() const OVERRIDE; + virtual bool Empty() const override; + virtual bool Full() const override; // returns the number of characters written. // appends up-to-'size' bytes to the ringbuffer. - virtual int Write(const char* bytes, int size) OVERRIDE; + virtual int Write(const char* bytes, int size) override; // Stores a pointer into the ring buffer in *ptr, and stores the number of // characters which are allowed to be written in *size. // If there are no writable bytes available, then *size will contain 0. - virtual void GetWritablePtr(char** ptr, int* size) const OVERRIDE; + virtual void GetWritablePtr(char** ptr, int* size) const override; // Stores a pointer into the ring buffer in *ptr, and stores the number of // characters which are allowed to be read in *size. // If there are no readable bytes available, then *size will contain 0. - virtual void GetReadablePtr(char** ptr, int* size) const OVERRIDE; + virtual void GetReadablePtr(char** ptr, int* size) const override; // Returns the number of bytes read into 'bytes'. - virtual int Read(char* bytes, int size) OVERRIDE; + virtual int Read(char* bytes, int size) override; // Removes all data from the ring buffer. - virtual void Clear() OVERRIDE; + virtual void Clear() override; // Reserves contiguous writable empty space in the buffer of size bytes. // Since the point of this class is to have a fixed size buffer, be careful @@ -76,15 +76,15 @@ class RingBuffer : public BufferInterface { // to consolidate fragmented free space. If the size requested is less than // or equal to BytesFree(), it is guaranteed that the buffer size will not // change. - virtual bool Reserve(int size) OVERRIDE; + virtual bool Reserve(int size) override; // Removes the oldest 'amount_to_advance' characters. // If amount_to_consume > ReadableBytes(), this performs a Clear() instead. - virtual void AdvanceReadablePtr(int amount_to_advance) OVERRIDE; + virtual void AdvanceReadablePtr(int amount_to_advance) override; // Moves the internal pointers around such that the amount of data specified // here is expected to already be resident (as if it was Written). - virtual void AdvanceWritablePtr(int amount_to_advance) OVERRIDE; + virtual void AdvanceWritablePtr(int amount_to_advance) override; protected: int read_idx() const { return read_idx_; } diff --git a/net/tools/flip_server/sm_connection.h b/net/tools/flip_server/sm_connection.h index 2fe3228..5c5a5fd 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); diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h index 2174274..2d2437a 100644 --- a/net/tools/flip_server/spdy_interface.h +++ b/net/tools/flip_server/spdy_interface.h @@ -35,7 +35,7 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { virtual ~SpdySM(); virtual void InitSMInterface(SMInterface* sm_http_interface, - int32 server_idx) OVERRIDE {} + int32 server_idx) override {} virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool, SMInterface* sm_interface, @@ -44,13 +44,13 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { std::string server_ip, std::string server_port, std::string remote_ip, - bool use_ssl) OVERRIDE; + bool use_ssl) override; // Create new SPDY framer after reusing SpdySM and negotiating new version void CreateFramer(SpdyMajorVersion spdy_version); private: - virtual void set_is_request() OVERRIDE {} + virtual void set_is_request() override {} SMInterface* NewConnectionInterface(); // virtual for tests virtual SMInterface* FindOrMakeNewSMConnectionInterface( @@ -63,31 +63,31 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { bool* is_https_scheme); // BufferedSpdyFramerVisitorInterface: - virtual void OnError(SpdyFramer::SpdyError error_code) OVERRIDE {} + virtual void OnError(SpdyFramer::SpdyError error_code) override {} virtual void OnStreamError(SpdyStreamId stream_id, - const std::string& description) OVERRIDE {} + const std::string& description) override {} // Called after all the header data for SYN_STREAM control frame is received. virtual void OnSynStream(SpdyStreamId stream_id, SpdyStreamId associated_stream_id, SpdyPriority priority, bool fin, bool unidirectional, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; // Called after all the header data for SYN_REPLY control frame is received. virtual void OnSynReply(SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; // Called after all the header data for HEADERS control frame is received. virtual void OnHeaders(SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; // Called when data frame header is received. virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE {} + bool fin) override {} // Called when data is received. // |stream_id| The stream receiving data. @@ -98,73 +98,73 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE; + bool fin) override; // Called when a SETTINGS frame is received. // |clear_persisted| True if the respective flag is set on the SETTINGS frame. - virtual void OnSettings(bool clear_persisted) OVERRIDE {} + virtual void OnSettings(bool clear_persisted) override {} // Called when an individual setting within a SETTINGS frame has been parsed // and validated. virtual void OnSetting(SpdySettingsIds id, uint8 flags, - uint32 value) OVERRIDE {} + uint32 value) override {} // Called when a PING frame has been parsed. - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE {} + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override {} // Called when a RST_STREAM frame has been parsed. virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE; + SpdyRstStreamStatus status) override; // Called when a GOAWAY frame has been parsed. virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE {} + SpdyGoAwayStatus status) override {} // Called when a WINDOW_UPDATE frame has been parsed. virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE {} + uint32 delta_window_size) override {} // Called when a PUSH_PROMISE frame has been parsed. virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - const SpdyHeaderBlock& headers) OVERRIDE {} + const SpdyHeaderBlock& headers) override {} - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE; + virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override; public: - virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE; - virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE; - virtual bool MessageFullyRead() const OVERRIDE; - virtual void SetStreamID(uint32 stream_id) OVERRIDE {} - virtual bool Error() const OVERRIDE; - virtual const char* ErrorAsString() const OVERRIDE; - virtual void Reset() OVERRIDE {} - virtual void ResetForNewInterface(int32 server_idx) OVERRIDE; - virtual void ResetForNewConnection() OVERRIDE; + virtual size_t ProcessReadInput(const char* data, size_t len) override; + virtual size_t ProcessWriteInput(const char* data, size_t len) override; + virtual bool MessageFullyRead() const override; + virtual void SetStreamID(uint32 stream_id) override {} + virtual bool Error() const override; + virtual const char* ErrorAsString() const override; + virtual void Reset() override {} + virtual void ResetForNewInterface(int32 server_idx) override; + virtual void ResetForNewConnection() override; // SMInterface's Cleanup is currently only called by SMConnection after a // protocol message as been fully read. Spdy's SMInterface does not need // to do any cleanup at this time. // TODO(klindsay) This method is probably not being used properly and // some logic review and method renaming is probably in order. - virtual void Cleanup() OVERRIDE {} + virtual void Cleanup() override {} // Send a settings frame - virtual int PostAcceptHook() OVERRIDE; + virtual int PostAcceptHook() override; virtual void NewStream(uint32 stream_id, uint32 priority, - const std::string& filename) OVERRIDE; + const std::string& filename) override; void AddToOutputOrder(const MemCacheIter& mci); - virtual void SendEOF(uint32 stream_id) OVERRIDE; - virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE; + virtual void SendEOF(uint32 stream_id) override; + virtual void SendErrorNotFound(uint32 stream_id) override; virtual size_t SendSynStream(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual size_t SendSynReply(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len, uint32 flags, - bool compress) OVERRIDE; + bool compress) override; BufferedSpdyFramer* spdy_framer() { return buffered_spdy_framer_.get(); } const OutputOrdering& output_ordering() const { @@ -193,7 +193,7 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { SpdyDataFlags flags, bool compress); void EnqueueDataFrame(DataFrame* df); - virtual void GetOutput() OVERRIDE; + virtual void GetOutput() override; private: scoped_ptr<BufferedSpdyFramer> buffered_spdy_framer_; diff --git a/net/tools/flip_server/streamer_interface.h b/net/tools/flip_server/streamer_interface.h index 0114491..ca04f1e 100644 --- a/net/tools/flip_server/streamer_interface.h +++ b/net/tools/flip_server/streamer_interface.h @@ -31,7 +31,7 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { void AddToOutputOrder(const MemCacheIter& mci) {} virtual void InitSMInterface(SMInterface* sm_other_interface, - int32 server_idx) OVERRIDE; + int32 server_idx) override; virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool, SMInterface* sm_interface, EpollServer* epoll_server, @@ -39,35 +39,35 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { std::string server_ip, std::string server_port, std::string remote_ip, - bool use_ssl) OVERRIDE; + bool use_ssl) override; - virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE; - virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE; - virtual bool MessageFullyRead() const OVERRIDE; - virtual void SetStreamID(uint32 stream_id) OVERRIDE {} - virtual bool Error() const OVERRIDE; - virtual const char* ErrorAsString() const OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void ResetForNewInterface(int32 server_idx) OVERRIDE {} - virtual void ResetForNewConnection() OVERRIDE; - virtual void Cleanup() OVERRIDE; - virtual int PostAcceptHook() OVERRIDE; + virtual size_t ProcessReadInput(const char* data, size_t len) override; + virtual size_t ProcessWriteInput(const char* data, size_t len) override; + virtual bool MessageFullyRead() const override; + virtual void SetStreamID(uint32 stream_id) override {} + virtual bool Error() const override; + virtual const char* ErrorAsString() const override; + virtual void Reset() override; + virtual void ResetForNewInterface(int32 server_idx) override {} + virtual void ResetForNewConnection() override; + virtual void Cleanup() override; + virtual int PostAcceptHook() override; virtual void NewStream(uint32 stream_id, uint32 priority, - const std::string& filename) OVERRIDE {} - virtual void SendEOF(uint32 stream_id) OVERRIDE {} - virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE {} + const std::string& filename) override {} + virtual void SendEOF(uint32 stream_id) override {} + virtual void SendErrorNotFound(uint32 stream_id) override {} virtual void SendOKResponse(uint32 stream_id, std::string output) {} virtual size_t SendSynStream(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual size_t SendSynReply(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len, uint32 flags, - bool compress) OVERRIDE {} - virtual void set_is_request() OVERRIDE; + bool compress) override {} + virtual void set_is_request() override; static std::string forward_ip_header() { return forward_ip_header_; } static void set_forward_ip_header(std::string value) { forward_ip_header_ = value; @@ -88,14 +88,14 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { int64 len, uint32 flags, bool compress) {} - virtual void GetOutput() OVERRIDE {} + virtual void GetOutput() override {} - virtual void ProcessBodyInput(const char* input, size_t size) OVERRIDE; - virtual void MessageDone() OVERRIDE; - virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE; - virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE {} - virtual void ProcessHeaderInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessTrailerInput(const char* input, size_t size) OVERRIDE {} + virtual void ProcessBodyInput(const char* input, size_t size) override; + virtual void MessageDone() override; + virtual void ProcessHeaders(const BalsaHeaders& headers) override; + virtual void ProcessBodyData(const char* input, size_t size) override {} + virtual void ProcessHeaderInput(const char* input, size_t size) override {} + virtual void ProcessTrailerInput(const char* input, size_t size) override {} virtual void ProcessRequestFirstLine(const char* line_input, size_t line_length, const char* method_input, @@ -103,7 +103,7 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { const char* request_uri_input, size_t request_uri_length, const char* version_input, - size_t version_length) OVERRIDE {} + size_t version_length) override {} virtual void ProcessResponseFirstLine(const char* line_input, size_t line_length, const char* version_input, @@ -111,15 +111,15 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { const char* status_input, size_t status_length, const char* reason_input, - size_t reason_length) OVERRIDE {} - virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {} - virtual void ProcessChunkExtensions(const char* input, size_t size) OVERRIDE { + size_t reason_length) override {} + virtual void ProcessChunkLength(size_t chunk_length) override {} + virtual void ProcessChunkExtensions(const char* input, size_t size) override { } - virtual void HeaderDone() OVERRIDE {} - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE; - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {} - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE; - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE; + virtual void HeaderDone() override {} + virtual void HandleHeaderError(BalsaFrame* framer) override; + virtual void HandleHeaderWarning(BalsaFrame* framer) override {} + virtual void HandleChunkingError(BalsaFrame* framer) override; + virtual void HandleBodyError(BalsaFrame* framer) override; void HandleError(); SMConnection* connection_; |