Made inheritance for Exception class virtual.

Fixed EndpointManager.

diff --git a/base/exception.h b/base/exception.h
index 7b7be4449ecee826f04105dfe3b09317023cb1fe..19831f3317a745508246250cfeec67ed484827bf 100644 (file)
--- a/base/exception.h
+++ b/base/exception.h
@@ -28,7 +28,7 @@ namespace icinga
  *
  * @ingroup base
  */
-class I2_BASE_API Exception : public exception
+class I2_BASE_API Exception : public virtual exception
 {
 public:
        Exception(void);

diff --git a/icinga/endpointmanager.h b/icinga/endpointmanager.h
index 6a6ac8a7c1c1002de98042dc8ee5e720ec5ff201..ed2413a1da8c512104f3b8b4397acccde73bcf97 100644 (file)
--- a/icinga/endpointmanager.h
+++ b/icinga/endpointmanager.h
@@ -77,6 +77,8 @@ private:
        void UnregisterServer(JsonRpcServer::Ptr server);
 
        int NewClientHandler(const NewClientEventArgs& ncea);
+};
+
 }
 
 #endif /* ENDPOINTMANAGER_H */