Adjust some more code that was depending on the function and delegate calling conventions being equal. There's also an instance in `tango.text.convert.Layout` that should be adjusted: {{{ Index: tango/text/convert/Layout.d =================================================================== --- tango/text/convert/Layout.d (revision 4578) +++ tango/text/convert/Layout.d (working copy) -660,8 +660,12 @@ case TypeCode.STRUCT: auto s = cast(TypeInfo_Struct) type; - if (s.xtoString) - return Utf.fromString8 (s.xtoString(p), result); + if (s.xtoString) { + char[] delegate() toString; + toString.ptr = p; + toString.funcptr = cast(char[] function()) s.xtoString; + return Utf.fromString8 (toString(), result); + } goto default; case TypeCode.INTERFACE: }}}

module classinfo3;

class C
{
    int i;
    float f;
    long l;
    int j;
}

void main()
{
    auto c = C.classinfo;
    if (c.offTi !is null)
    {
    assert(c.offTi.length == 4);

    size_t base = 2*size_t.sizeof;

    assert(c.offTi[0].offset == base);
    assert(c.offTi[0].ti == typeid(int));
    assert(c.offTi[1].offset == base+4);
    assert(c.offTi[1].ti == typeid(float));
    assert(c.offTi[2].offset == base+8);
    assert(c.offTi[2].ti == typeid(long));
    assert(c.offTi[3].offset == base+16);
    assert(c.offTi[3].ti == typeid(int));
    }
}