.

src/hos_cosgi_core/include/hos_cosgi_core/hos/cosgi/service/Implementation.h

@@ -47,7 +47,8 @@ class Object
  */
 template<class _Service>
 class Service
-	: public virtual interface::Service {
+	: public virtual interface::Service,
+	  public Object {
 
 public:
 
@@ -88,8 +89,8 @@ template <class... _Args> class Observable {};
  * Convenience template merging the Object class and the Observable template into a single template.
  */
 template<class... _Args> class ObservableObject
-	: public virtual Object,
+	: public Object,
-	  public virtual Observable<_Args...> {};
+	  public Observable<_Args...> {};
 
 
 
@@ -97,8 +98,8 @@ template<class... _Args> class ObservableObject
  * Convenience template merging the Service class and the Observable template into a single template.
  */
 template<class _Service, class... _Args> class ObservableService
-	: public virtual Service<_Service>,
+	: public Service<_Service>,
-	  public virtual Observable<_Args...> {};
+	  public Observable<_Args...> {};
 
 
 

src/hos_cosgi_core/include/hos_cosgi_core/hos/cosgi/service/Interface.h

@@ -24,6 +24,10 @@ namespace interface {
 class Object {
 public:
 	virtual ~Object() {}
+
+	template<class T> T* castPtr() {
+		return dynamic_cast<T*>(this);
+	}
 };
 
 

src/hos_cosgi_core/src/hos/cosgi/service/core/CoreServiceImpl.h

@@ -23,7 +23,7 @@ namespace core {
  */
 class CoreServiceImpl
 	: public virtual CoreService,
-	  public virtual implementation::ObservableService<CoreServiceImpl, CoreServiceEvent> {
+	  public implementation::ObservableService<CoreServiceImpl, CoreServiceEvent> {
 
 private:
 

src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/DeviceRepositoryServiceImpl.h

@@ -59,7 +59,7 @@ class DeviceRepositoryServiceImpl;
  **/
 class DeviceImpl
 	: public virtual Device,
-	  public virtual implementation::ObservableObject<DeviceEventType, DeviceEvent> {
+	  public implementation::ObservableObject<DeviceEventType, DeviceEvent> {
 
 private:
 
@@ -134,7 +134,7 @@ public:
  **/
 class DeviceRepositoryServiceImpl
 	: public virtual DeviceRepositoryService,
-	  public virtual implementation::ObservableService<DeviceRepositoryServiceImpl, DeviceEventType, DeviceEvent> {
+	  public implementation::ObservableService<DeviceRepositoryServiceImpl, DeviceEventType, DeviceEvent> {
 
 private:
 	typedef std::map<std::string, std::shared_ptr<DeviceImpl>> devicesMap_t;

src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/RuleEngineServiceImpl.h

@@ -49,7 +49,7 @@ class RulePackageImpl;
 
 class RuleEngineServiceImpl :
 		public virtual RuleEngineService,
-		public virtual implementation::Service<RuleEngineServiceImpl> {
+		public implementation::Service<RuleEngineServiceImpl> {
 
 private:
 	typedef std::map<std::string, std::shared_ptr<rules::RulePackageImpl>> rulePkgMap_t;

src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rules/RuleImpl.h

@@ -65,7 +65,7 @@ public:
 	static std::shared_ptr<RuleImpl> createRule(RulePackageImpl* parent, const std::string name, Variant raw);
 
 	virtual RulePackage* getParent() noexcept {
-		return dynamic_cast<RulePackage*>(parent);
+		return parent->castPtr<RulePackage>();
 	}
 
 	virtual const std::string& getName() noexcept {

src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rules/RulePackageImpl.h

@@ -65,7 +65,7 @@ public:
 	const std::string language;
 
 	virtual service::ruleengine::RuleEngineService* getParent() noexcept override {
-		return dynamic_cast<service::ruleengine::RuleEngineService*>(parent);
+		return parent->castPtr<service::ruleengine::RuleEngineService>();
 	}
 
 	virtual const std::string& getName() noexcept override {

src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rules/conditions/DeviceMsgCondition.h

@@ -75,7 +75,7 @@ public:
 
 
 class DeviceStatusMsgConditionFactory
-	: public RuleConditionFactory {
+	: public virtual RuleConditionFactory {
 public:
 	virtual std::shared_ptr<RuleCondition> createCondition(rules::Rule* parent, const Variant& raw) override;
 };
@@ -98,7 +98,7 @@ public:
 
 
 class DeviceCommandMsgConditionFactory
-	: public RuleConditionFactory {
+	: public virtual RuleConditionFactory {
 public:
 	virtual std::shared_ptr<RuleCondition> createCondition(rules::Rule* parent, const Variant& raw) override;
 };
@@ -125,7 +125,7 @@ public:
 
 
 class DeviceStateChangeConditionFactory
-	: public RuleConditionFactory {
+	: public virtual RuleConditionFactory {
 public:
 	virtual std::shared_ptr<RuleCondition> createCondition(rules::Rule* parent, const Variant& raw) override;
 };

src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rules/conditions/LogicalAndCondition.h

@@ -42,7 +42,7 @@ public:
 
 
 class LogicalAndConditionFactory
-	: public RuleConditionFactory {
+	: public virtual RuleConditionFactory {
 public:
 	virtual std::shared_ptr<RuleCondition> createCondition(rules::Rule* parent, const Variant& raw) override;
 };

src/hos_cosgi_ruleengine/src/hos/cosgi/service/ruleengine/rules/conditions/LogicalOrCondition.h

@@ -41,7 +41,7 @@ public:
 
 
 class LogicalOrConditionFactory
-	: public RuleConditionFactory {
+	: public virtual RuleConditionFactory {
 public:
 	virtual std::shared_ptr<RuleCondition> createCondition(rules::Rule* parent, const Variant& raw) override;
 };

src/hos_cosgi_scripting_python/src/hos/cosgi/service/scripting/python/PyScriptingServiceImpl.h

@@ -104,7 +104,7 @@ public:
  **/
 class PyScriptingService
 	: public virtual service::scripting::ScriptingService,
-	  public virtual implementation::Service<PyScriptingService> {
+	  public implementation::Service<PyScriptingService> {
 
 private:
 

src/hos_cosgi_webserver/src/hos/cosgi/service/webserver/webserver_serviceimpl.h

@@ -35,7 +35,7 @@ namespace webserver {
 class WebServerServiceImpl;
 class WebServerServiceImpl :
 		public virtual WebServerService,
-		public virtual implementation::Service<WebServerServiceImpl> {
+		public implementation::Service<WebServerServiceImpl> {
 private:
 
 	service::core::CoreService* coreService = nullptr;