SocketEvents: inherit from Stream

refs #6477

diff --git a/lib/base/socketevents.hpp b/lib/base/socketevents.hpp
index 486ec4df170f1273660bbac0e6025ae1575cf8c4..26dc7701909ba82562ce1a98e36251d99b94e1d3 100644 (file)
--- 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 8e4ceb08eb163c524102609e431610452651894d..45519b5b18b191c9f8ce32643cbd500cb6ccc565 100644 (file)
--- 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);