From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 27 Nov 2014 05:31:43 +0000 (+0100)
Subject: Remove the __parent field in the DynamicObject class
X-Git-Tag: v2.3.0~601
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=358d91e9128e382e897ee728d9c44bb3d0ed6ccb;p=icinga2

Remove the __parent field in the DynamicObject class

refs #7748
---

diff --git a/lib/base/dynamicobject.ti b/lib/base/dynamicobject.ti
index 55aad8248..0b58e9493 100644
--- a/lib/base/dynamicobject.ti
+++ b/lib/base/dynamicobject.ti
@@ -35,8 +35,6 @@ public:
 
 abstract class DynamicObject
 {
-	[protected] Object::Ptr __parent (ParentScope);
-
 	[config, internal] String __name (Name);
 	[config] String name (ShortName) {
 		get {{{
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 65b096503..966d3000d 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -177,8 +177,6 @@ DynamicObject::Ptr ConfigItem::Commit(bool discard)
 	if (discard)
 		m_Expression.reset();
 
-	dobj->SetParentScope(Object::Ptr());
-
 	String name = m_Name;
 
 	NameComposer *nc = dynamic_cast<NameComposer *>(type.get());