diff options
author | kwiberg@webrtc.org <kwiberg@webrtc.org> | 2015-03-09 22:21:53 +0000 |
---|---|---|
committer | kwiberg@webrtc.org <kwiberg@webrtc.org> | 2015-03-09 22:24:25 +0000 |
commit | 67186fe00cc68cbe03aa66d17fb4962458ca96d2 (patch) | |
tree | 6ef2b0c9b722ee565836e1f7812094eeb7968d2a /webrtc/base/socketstream.h | |
parent | 2989204130f9a4c20e3e903d38218df932d9f69d (diff) | |
download | webrtc-67186fe00cc68cbe03aa66d17fb4962458ca96d2.tar.gz |
Fix clang style warnings in webrtc/base
Mostly this consists of marking functions with override when
applicable, and moving function bodies from .h to .cc files.
Not inlining virtual functions with simple bodies such as
{ return false; }
strikes me as probably losing more in readability than we gain in
binary size and compilation time, but I guess it's just like any other
case where enabling a generally good warning forces us to write
slightly worse code in a couple of places.
BUG=163
R=kjellander@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/47429004
Cr-Commit-Position: refs/heads/master@{#8656}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8656 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/base/socketstream.h')
-rw-r--r-- | webrtc/base/socketstream.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/webrtc/base/socketstream.h b/webrtc/base/socketstream.h index ce9939b0ff..4e65cb2b87 100644 --- a/webrtc/base/socketstream.h +++ b/webrtc/base/socketstream.h @@ -22,22 +22,26 @@ namespace rtc { class SocketStream : public StreamInterface, public sigslot::has_slots<> { public: explicit SocketStream(AsyncSocket* socket); - virtual ~SocketStream(); + ~SocketStream() override; void Attach(AsyncSocket* socket); AsyncSocket* Detach(); AsyncSocket* GetSocket() { return socket_; } - virtual StreamState GetState() const; + StreamState GetState() const override; - virtual StreamResult Read(void* buffer, size_t buffer_len, - size_t* read, int* error); + StreamResult Read(void* buffer, + size_t buffer_len, + size_t* read, + int* error) override; - virtual StreamResult Write(const void* data, size_t data_len, - size_t* written, int* error); + StreamResult Write(const void* data, + size_t data_len, + size_t* written, + int* error) override; - virtual void Close(); + void Close() override; private: void OnConnectEvent(AsyncSocket* socket); |