Repository: mesos Updated Branches: refs/heads/master 86f32a4be -> 5eb72ec74
Added 'override' to function declarations in 'LibeventSSLSocketImpl'. Inconsistent use of the `override` keyword in `LibeventSSLSocketImpl` was causing warnings during clang builds. This patch makes use of the keyword across all relevant declarations in the class. Review: https://reviews.apache.org/r/57160/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5eb72ec7 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5eb72ec7 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5eb72ec7 Branch: refs/heads/master Commit: 5eb72ec74dba61077c3006a7f31b6974c7994dd5 Parents: 2264430 Author: Greg Mann <[email protected]> Authored: Tue Feb 28 14:29:39 2017 -0800 Committer: Joseph Wu <[email protected]> Committed: Tue Feb 28 14:33:45 2017 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/src/libevent_ssl_socket.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/5eb72ec7/3rdparty/libprocess/src/libevent_ssl_socket.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/libevent_ssl_socket.hpp b/3rdparty/libprocess/src/libevent_ssl_socket.hpp index e589a04..9493a50 100644 --- a/3rdparty/libprocess/src/libevent_ssl_socket.hpp +++ b/3rdparty/libprocess/src/libevent_ssl_socket.hpp @@ -37,17 +37,17 @@ public: LibeventSSLSocketImpl(int _s); - virtual ~LibeventSSLSocketImpl(); + ~LibeventSSLSocketImpl() override; // Implement 'SocketImpl' interface. - virtual Future<Nothing> connect(const Address& address); - virtual Future<size_t> recv(char* data, size_t size); + Future<Nothing> connect(const Address& address) override; + Future<size_t> recv(char* data, size_t size) override; // Send does not currently support discard. See implementation. - virtual Future<size_t> send(const char* data, size_t size); - virtual Future<size_t> sendfile(int_fd fd, off_t offset, size_t size); - virtual Try<Nothing> listen(int backlog); - virtual Future<std::shared_ptr<SocketImpl>> accept(); - virtual SocketImpl::Kind kind() const { return SocketImpl::Kind::SSL; } + Future<size_t> send(const char* data, size_t size) override; + Future<size_t> sendfile(int_fd fd, off_t offset, size_t size) override; + Try<Nothing> listen(int backlog) override; + Future<std::shared_ptr<SocketImpl>> accept() override; + SocketImpl::Kind kind() const override { return SocketImpl::Kind::SSL; } // Shuts down the socket. // @@ -56,7 +56,7 @@ public: // do not have a concept of read/write-only shutdown. If either end // of the socket is closed, then the futures of any outstanding read // requests will be completed (possibly as failures). - virtual Try<Nothing> shutdown(int how) override; + Try<Nothing> shutdown(int how) override; // We need a post-initializer because 'shared_from_this()' is not // valid until the constructor has finished.
