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: }}}

extern(C) int printf(char*, ...);

void main()
{
    printf("Testing functions\n");
    int i = 5;
    assert(a(i) == 110);
    assert(i == 11);

    S s;
    s.i = 5;
    d(s);
    assert(s.i == 5);
    e(s);
    assert(s.i == 6);

    printf("  SUCCESS\n");
}

int a(ref int i)
{
    i*=2;
    return b(i);
}

int b(ref int i)
{
    i++;
    return c(i);
}

int c(int i)
{
    return i*10;
}

struct S
{
    int i;
}

void d(S s)
{
    s.i++;
}

void e(ref S s)
{
    s.i++;
}