summaryrefslogtreecommitdiffstats
path: root/modules/openssl/stream_peer_openssl.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-14 11:07:57 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-14 11:10:42 -0300
commitdcb95ec1473eff3f455909cd81c3cd50b1e1159b (patch)
tree60343275911d48ebf993041dec92e1eac112b746 /modules/openssl/stream_peer_openssl.h
parent93ab45b6b5c4f8e0619e963156c983009d399a9d (diff)
downloadredot-engine-dcb95ec1473eff3f455909cd81c3cd50b1e1159b.tar.gz
removed duplicated functions in class hierarchy that were bound more than once
added a check to detect this case in the future
Diffstat (limited to 'modules/openssl/stream_peer_openssl.h')
-rw-r--r--modules/openssl/stream_peer_openssl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/openssl/stream_peer_openssl.h b/modules/openssl/stream_peer_openssl.h
index d79fb97ff8..3d6875698c 100644
--- a/modules/openssl/stream_peer_openssl.h
+++ b/modules/openssl/stream_peer_openssl.h
@@ -85,11 +85,11 @@ protected:
public:
- virtual Error accept(Ref<StreamPeer> p_base);
- virtual Error connect(Ref<StreamPeer> p_base,bool p_validate_certs=false,const String& p_for_hostname=String());
+ virtual Error accept_stream(Ref<StreamPeer> p_base);
+ virtual Error connect_to_stream(Ref<StreamPeer> p_base,bool p_validate_certs=false,const String& p_for_hostname=String());
virtual Status get_status() const;
- virtual void disconnect();
+ virtual void disconnect_from_stream();
virtual Error put_data(const uint8_t* p_data,int p_bytes);
virtual Error put_partial_data(const uint8_t* p_data,int p_bytes, int &r_sent);