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 d;

void main()
{
    int delegate() dg;

    struct S
    {
        int i;
        long l;
        float f;

        int func()
        {
            return 42;
        }
    }

    S s;
    auto dg2 = &s.func;
    int i = dg2();
    assert(i == 42);

    i = f(dg2, 1);
    assert(i == 43);
}

int f(int delegate() dg, int i)
{
    return dg() + i;
}

/*
struct S
{
    int i;
    float f;
    int square()
    {
        return i*i;
    }
}

S s;

void main()
{
    auto dg = &s.square;
}
*/