diff gen/classes.cpp @ 1455:89e38fbfef1f

Automated merge with http://hg.dsource.org/projects/ldc
author Robert Clipsham <robert@octarineparrot.com>
date Mon, 01 Jun 2009 19:02:20 +0100
parents 5d0c043ff131 f35a9a77d256
children a5526b7a5ae6
line wrap: on
line diff
--- a/gen/classes.cpp	Mon Jun 01 01:28:18 2009 +0200
+++ b/gen/classes.cpp	Mon Jun 01 19:02:20 2009 +0100
@@ -678,6 +678,8 @@
 //         ClassInfo *base;        // base class
 //         void *destructor;
 //         void *invariant;        // class invariant
+//         version(D_Version2)
+//         	void *xgetMembers; 
 //         uint flags;
 //         void *deallocator;
 //         OffsetTypeInfo[] offTi;
@@ -696,7 +698,11 @@
 
     ClassDeclaration* cinfo = ClassDeclaration::classinfo;
 
+#if DMDV2
+    if (cinfo->fields.dim != 13)
+#else
     if (cinfo->fields.dim != 12)
+#endif
     {
         error("object.d ClassInfo class is incorrect");
         fatal();