From: Alexander A. Klimov <alexander.klimov@icinga.com>
Date: Tue, 24 Jul 2018 12:24:56 +0000 (+0200)
Subject: SocketEvents: inherit from Stream
X-Git-Tag: v2.11.0-rc1~296^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9a9469868c46c04fe515f908d3f3f865a40aa5b;p=icinga2

SocketEvents: inherit from Stream

refs #6477
---

diff --git a/lib/base/socketevents.hpp b/lib/base/socketevents.hpp
index 486ec4df1..26dc77019 100644
--- a/lib/base/socketevents.hpp
+++ b/lib/base/socketevents.hpp
@@ -22,6 +22,7 @@
 
 #include "base/i2-base.hpp"
 #include "base/socket.hpp"
+#include "base/stream.hpp"
 #include <boost/thread/condition_variable.hpp>
 #include <thread>
 
@@ -37,9 +38,11 @@ namespace icinga
  *
  * @ingroup base
  */
-class SocketEvents
+class SocketEvents : public Stream
 {
 public:
+	DECLARE_PTR_TYPEDEFS(SocketEvents);
+
 	~SocketEvents();
 
 	virtual void OnEvent(int revents);
diff --git a/lib/base/tlsstream.hpp b/lib/base/tlsstream.hpp
index 8e4ceb08e..45519b5b1 100644
--- a/lib/base/tlsstream.hpp
+++ b/lib/base/tlsstream.hpp
@@ -43,7 +43,7 @@ enum TlsAction
  *
  * @ingroup base
  */
-class TlsStream final : public Stream, private SocketEvents
+class TlsStream final : public SocketEvents
 {
 public:
 	DECLARE_PTR_TYPEDEFS(TlsStream);