comparison 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
comparison
equal deleted inserted replaced
1449:301a916eceef 1455:89e38fbfef1f
676 // void *[] vtbl; 676 // void *[] vtbl;
677 // Interface[] interfaces; 677 // Interface[] interfaces;
678 // ClassInfo *base; // base class 678 // ClassInfo *base; // base class
679 // void *destructor; 679 // void *destructor;
680 // void *invariant; // class invariant 680 // void *invariant; // class invariant
681 // version(D_Version2)
682 // void *xgetMembers;
681 // uint flags; 683 // uint flags;
682 // void *deallocator; 684 // void *deallocator;
683 // OffsetTypeInfo[] offTi; 685 // OffsetTypeInfo[] offTi;
684 // void *defaultConstructor; 686 // void *defaultConstructor;
685 // TypeInfo typeinfo; // since dmd 1.045 687 // TypeInfo typeinfo; // since dmd 1.045
694 IrStruct* ir = cd->ir.irStruct; 696 IrStruct* ir = cd->ir.irStruct;
695 assert(ir); 697 assert(ir);
696 698
697 ClassDeclaration* cinfo = ClassDeclaration::classinfo; 699 ClassDeclaration* cinfo = ClassDeclaration::classinfo;
698 700
701 #if DMDV2
702 if (cinfo->fields.dim != 13)
703 #else
699 if (cinfo->fields.dim != 12) 704 if (cinfo->fields.dim != 12)
705 #endif
700 { 706 {
701 error("object.d ClassInfo class is incorrect"); 707 error("object.d ClassInfo class is incorrect");
702 fatal(); 708 fatal();
703 } 709 }
704 710