Changeset 9859 in orxonox.OLD for branches

Timestamp:

Oct 1, 2006, 11:13:29 AM (18 years ago)

Author:

bensch

Message:

new_class_id: segfault-prevention in the PNode deletion process (not the nicest way, but it works)
This was with me for 3 months now…

Location:

branches/new_class_id/src/lib

Files:

• coord/p_node.cc (modified) (1 diff)
• lang/Makefile.am (modified) (2 diffs)
• lang/base_object.cc (modified) (1 diff)
• lang/base_object.h (modified) (1 diff)
• util/loading/load_param.cc (modified) (1 diff)
• util/loading/load_param.h (modified) (1 diff)

branches/new_class_id/src/lib/coord/p_node.cc

@@ -88 +88 @@
     if (deleteNode == last)
     {
-      PRINTF(1)("Node same as last that was tried to be deleted. FORCE delete of %p\n", deleteNode);
-      delete deleteNode;
+      PRINTF(1)("Node same as last that was tried to be deleted. FORCE reparent to NULL of %p\n", deleteNode);
+      (deleteNode->setParent( NULL));
       continue;
     }

branches/new_class_id/src/lib/lang/Makefile.am

@@ -1 @@
-MAINSRCDIR=../..
-include $(MAINSRCDIR)/defs/include_paths.am
+INCLUDES = -I../..
+INCLUDES +=-I..
+INCLUDES +=-I../util
 
 noinst_LIBRARIES = libORXlang.a
@@ -13 +14 @@
                 class_id.h \
                 object_list.h
-

branches/new_class_id/src/lib/lang/base_object.cc

@@ -17 +17 @@
 #include "base_object.h"
 
-#include "debug.h"
+#include "defs/debug.h"
 #include "util/loading/load_param.h"
 

branches/new_class_id/src/lib/lang/base_object.h

@@ -15 +15 @@
 
 #include "object_list.h"
-#include "sigslot/slot.h"
+#include "util/sigslot/slot.h"
 
 #include <string>

branches/new_class_id/src/lib/util/loading/load_param.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOADING
 
-#include "util/loading/load_param.h"
+#include "load_param.h"
 #include "load_param_class_description.h"
 #include "compiler.h"

branches/new_class_id/src/lib/util/loading/load_param.h

@@ -22 +22 @@
 #define _LOAD_PARAM_H
 
-#include "executor/executor_substring.h"
-#include "executor/executor_member.h"
-#include "executor/functor_member.h"
+#include "util/executor/executor_substring.h"
+#include "util/executor/executor_member.h"
+#include "util/executor/functor_member.h"
 
 #include "parser/tinyxml/tinyxml.h"