From: Martin Baulig <martin@novell.com>
Date: Fri, 18 Jun 2004 03:12:01 +0000 (-0000)
Subject: 2004-06-18  Martin Baulig  <martin@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=f6f244119f3bde495ca10ee7699e9db0f102debb;p=mono.git

2004-06-18  Martin Baulig  <martin@ximian.com>

	* mono-debug-debugger.c (write_class): Write the parent class at
	the end of the header.

svn path=/trunk/mono/; revision=29841
---

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 94c7e163cea..60996493f92 100644
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-18  Martin Baulig  <martin@ximian.com>
+
+	* mono-debug-debugger.c (write_class): Write the parent class at
+	the end of the header.
 
 Thu Jun 17 16:50:44 CEST 2004 Paolo Molaro <lupus@ximian.com>
 
diff --git a/mono/metadata/mono-debug-debugger.c b/mono/metadata/mono-debug-debugger.c
index 93153056d0d..3b895ace67d 100644
--- a/mono/metadata/mono-debug-debugger.c
+++ b/mono/metadata/mono-debug-debugger.c
@@ -733,6 +733,10 @@ write_class (MonoDebuggerSymbolTable *table, MonoClass *klass)
 	WRITE_UINT32 (ptr, num_static_methods * (4 + 2 * sizeof (gpointer)) + num_static_params * sizeof (gpointer));
 	WRITE_UINT32 (ptr, num_ctors);
 	WRITE_UINT32 (ptr, num_ctors * (4 + 2 * sizeof (gpointer)) + num_ctor_params * sizeof (gpointer));
+	if (klass->parent && (klass->parent != mono_defaults.object_class))
+		WRITE_UINT32 (ptr, write_class (table, klass->parent));
+	else
+		WRITE_UINT32 (ptr, 0);
 
 	for (i = 0; i < klass->field.count; i++) {
 		if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
@@ -819,11 +823,6 @@ write_class (MonoDebuggerSymbolTable *table, MonoClass *klass)
 
 	g_ptr_array_free (ctors, FALSE);
 
-	if (klass->parent && (klass->parent != mono_defaults.object_class))
-		WRITE_UINT32 (ptr, write_class (table, klass->parent));
-	else
-		WRITE_UINT32 (ptr, 0);
-
 	if (ptr - old_ptr != data_size) {
 		g_warning (G_STRLOC ": %d,%d,%d", ptr - old_ptr, data_size, sizeof (gpointer));
 		if (klass)
diff --git a/mono/metadata/mono-debug.h b/mono/metadata/mono-debug.h
index cd47176360d..9599f95adb7 100644
--- a/mono/metadata/mono-debug.h
+++ b/mono/metadata/mono-debug.h
@@ -75,7 +75,7 @@ struct _MonoDebugVarInfo {
 	guint32 end_scope;
 };
 
-#define MONO_DEBUGGER_VERSION				41
+#define MONO_DEBUGGER_VERSION				42
 #define MONO_DEBUGGER_MAGIC				0x7aff65af4253d427ULL
 
 extern MonoDebugFormat mono_debug_format;