From 3f708fce219ab192501b06feb0f01122861c186a Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 24 May 2012 19:36:37 +0200
Subject: [PATCH] Made inheritance for Exception class virtual. Fixed
EndpointManager.
---
base/exception.h | 2 +-
icinga/endpointmanager.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/base/exception.h b/base/exception.h
index 7b7be4449..19831f331 100644
--- 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 6a6ac8a7c..ed2413a1d 100644
--- 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 */