| Index: net/tools/flip_server/streamer_interface.h
|
| diff --git a/net/tools/flip_server/streamer_interface.h b/net/tools/flip_server/streamer_interface.h
|
| index 0114491de49eb4a1ffd69c761e0831901f5fa814..ca04f1e8d378a0668a5e99ff959405ff6cbac21c 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_;
|
|
|