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

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

void main()
{
    int[int] aa;
    aa = [1:1, 2:4, 3:9, 4:16];
    printf("---\n");
    foreach(int k, int v; aa)
        printf("aa[%d] = %d\n", k, v);
    aa.rehash;
    printf("---\n");
    foreach(int k, int v; aa)
        printf("aa[%d] = %d\n", k, v);
    size_t n = aa.length;
    assert(n == 4);
    int[] keys = aa.keys;
    assert(keys[] == [1,2,3,4][]);
    int[] vals = aa.values;
    assert(vals[] == [1,4,9,16][]);
    aa.remove(3);
    printf("---\n");
    foreach(int k, int v; aa)
        printf("aa[%d] = %d\n", k, v);
    assert(aa.length == 3);
}