| Index: net/tools/flip_server/ring_buffer.h
|
| diff --git a/net/tools/flip_server/ring_buffer.h b/net/tools/flip_server/ring_buffer.h
|
| index b129ee8d014e8a43afedaf2f7296f1605ea7ac95..bb3b39f1ee7c43212c02a4219cea57b27697dbb0 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_; }
|
|
|