summaryrefslogtreecommitdiffstats
path: root/net/curvecp
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 17:57:16 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 17:57:16 +0000
commitaddc1be9629d2e030a853eefecf6997a229b91b9 (patch)
tree353e8aa621253eecf33a27a3c858041d794081bb /net/curvecp
parentd0d912b0b0d084e5b10a004df2f1b469caeee3ee (diff)
downloadchromium_src-addc1be9629d2e030a853eefecf6997a229b91b9.zip
chromium_src-addc1be9629d2e030a853eefecf6997a229b91b9.tar.gz
chromium_src-addc1be9629d2e030a853eefecf6997a229b91b9.tar.bz2
Add OVERRIDE to net/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8648001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/curvecp')
-rw-r--r--net/curvecp/client_packetizer.h9
-rw-r--r--net/curvecp/curvecp_client_socket.h39
-rw-r--r--net/curvecp/curvecp_server_socket.h15
-rw-r--r--net/curvecp/messenger.h4
-rw-r--r--net/curvecp/server_messenger.h3
-rw-r--r--net/curvecp/server_packetizer.h9
-rw-r--r--net/curvecp/test_server.h5
7 files changed, 49 insertions, 35 deletions
diff --git a/net/curvecp/client_packetizer.h b/net/curvecp/client_packetizer.h
index 4946ce8..4adfe80 100644
--- a/net/curvecp/client_packetizer.h
+++ b/net/curvecp/client_packetizer.h
@@ -6,6 +6,7 @@
#define NET_CURVECP_CLIENT_PACKETIZER_H_
#pragma once
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/task.h"
#include "net/base/address_list.h"
@@ -33,10 +34,10 @@ class ClientPacketizer : public Packetizer {
virtual int SendMessage(ConnectionKey key,
const char* data,
size_t length,
- OldCompletionCallback* callback);
- virtual void Close(ConnectionKey key);
- virtual int GetPeerAddress(IPEndPoint* endpoint) const;
- virtual int max_message_payload() const;
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual void Close(ConnectionKey key) OVERRIDE;
+ virtual int GetPeerAddress(IPEndPoint* endpoint) const OVERRIDE;
+ virtual int max_message_payload() const OVERRIDE;
private:
enum StateType {
diff --git a/net/curvecp/curvecp_client_socket.h b/net/curvecp/curvecp_client_socket.h
index e758359..fc56440 100644
--- a/net/curvecp/curvecp_client_socket.h
+++ b/net/curvecp/curvecp_client_socket.h
@@ -6,6 +6,7 @@
#define NET_CURVECP_CURVECP_CLIENT_SOCKET_H_
#pragma once
+#include "base/compiler_specific.h"
#include "net/base/completion_callback.h"
#include "net/curvecp/client_packetizer.h"
#include "net/curvecp/messenger.h"
@@ -25,25 +26,29 @@ class CurveCPClientSocket : public StreamSocket {
virtual ~CurveCPClientSocket();
// ClientSocket methods:
- virtual int Connect(OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual int GetPeerAddress(AddressList* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
- virtual const BoundNetLog& NetLog() const;
- virtual void SetSubresourceSpeculation();
- virtual void SetOmniboxSpeculation();
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
+ virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
+ virtual const BoundNetLog& NetLog() const OVERRIDE;
+ virtual void SetSubresourceSpeculation() OVERRIDE;
+ virtual void SetOmniboxSpeculation() OVERRIDE;
+ virtual bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// Socket methods:
- virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
+ virtual int Read(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual int Write(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
private:
AddressList addresses_;
diff --git a/net/curvecp/curvecp_server_socket.h b/net/curvecp/curvecp_server_socket.h
index 32be5a4..076eedc 100644
--- a/net/curvecp/curvecp_server_socket.h
+++ b/net/curvecp/curvecp_server_socket.h
@@ -6,6 +6,7 @@
#define NET_CURVECP_CURVECP_SERVER_SOCKET_H_
#pragma once
+#include "base/compiler_specific.h"
#include "net/base/completion_callback.h"
#include "net/curvecp/connection_key.h"
#include "net/curvecp/protocol.h"
@@ -33,13 +34,17 @@ class CurveCPServerSocket : public Socket,
void Close();
// Socket methods:
- virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
+ virtual int Read(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual int Write(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
// ServerMessenger::Acceptor methods:
- virtual void OnAccept(ConnectionKey key);
+ virtual void OnAccept(ConnectionKey key) OVERRIDE;
private:
CurveCPServerSocket(const ConnectionKey& key,
diff --git a/net/curvecp/messenger.h b/net/curvecp/messenger.h
index d130b8a..b6b2d69 100644
--- a/net/curvecp/messenger.h
+++ b/net/curvecp/messenger.h
@@ -37,12 +37,12 @@ class Messenger : public base::NonThreadSafe,
int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
// Packetizer::Listener methods:
- virtual void OnConnection(ConnectionKey key);
+ virtual void OnConnection(ConnectionKey key) OVERRIDE;
virtual void OnClose(Packetizer* packetizer, ConnectionKey key);
virtual void OnMessage(Packetizer* packetizer,
ConnectionKey key,
unsigned char* msg,
- size_t length);
+ size_t length) OVERRIDE;
protected:
ConnectionKey key_;
diff --git a/net/curvecp/server_messenger.h b/net/curvecp/server_messenger.h
index d7fb95a..ab131d7 100644
--- a/net/curvecp/server_messenger.h
+++ b/net/curvecp/server_messenger.h
@@ -9,6 +9,7 @@
#include <list>
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "base/task.h"
#include "net/curvecp/messenger.h"
#include "net/curvecp/packetizer.h"
@@ -33,7 +34,7 @@ class ServerMessenger : public Messenger {
virtual ~ServerMessenger();
// Override OnConnection to track incoming connections.
- virtual void OnConnection(ConnectionKey key);
+ virtual void OnConnection(ConnectionKey key) OVERRIDE;
private:
Acceptor* acceptor_;
diff --git a/net/curvecp/server_packetizer.h b/net/curvecp/server_packetizer.h
index 68a91c0..c149424 100644
--- a/net/curvecp/server_packetizer.h
+++ b/net/curvecp/server_packetizer.h
@@ -8,6 +8,7 @@
#include <map>
+#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "net/base/completion_callback.h"
#include "net/base/ip_endpoint.h"
@@ -37,10 +38,10 @@ class ServerPacketizer : public base::RefCounted<ServerPacketizer>,
virtual int SendMessage(ConnectionKey key,
const char* data,
size_t length,
- OldCompletionCallback* callback);
- virtual void Close(ConnectionKey key);
- virtual int GetPeerAddress(IPEndPoint* endpoint) const;
- virtual int max_message_payload() const;
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual void Close(ConnectionKey key) OVERRIDE;
+ virtual int GetPeerAddress(IPEndPoint* endpoint) const OVERRIDE;
+ virtual int max_message_payload() const OVERRIDE;
private:
enum State {
diff --git a/net/curvecp/test_server.h b/net/curvecp/test_server.h
index 3ece594..68f1377 100644
--- a/net/curvecp/test_server.h
+++ b/net/curvecp/test_server.h
@@ -6,6 +6,7 @@
#define NET_CURVECP_TEST_SERVER_H_
#pragma once
+#include "base/compiler_specific.h"
#include "base/task.h"
#include "net/base/completion_callback.h"
#include "net/base/test_data_stream.h"
@@ -28,10 +29,10 @@ class TestServer : public OldCompletionCallback,
bool Start(int port);
// OldCompletionCallback methods:
- virtual void RunWithParams(const Tuple1<int>& params);
+ virtual void RunWithParams(const Tuple1<int>& params) OVERRIDE;
// CurveCPServerSocket::Acceptor methods:
- virtual void OnAccept(CurveCPServerSocket* new_socket);
+ virtual void OnAccept(CurveCPServerSocket* new_socket) OVERRIDE;
// Returns the number of errors this server encountered.
int error_count() { return errors_; }