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 switch3;
extern(C) int printf(char*, ...);

void main()
{
    char[] str = "hello";
    int i;
    switch(str)
    {
    case "world":
        i = 1;
        assert(0);
    case "hello":
        i = 2;
        break;
    case "a","b","c":
        i = 3;
        assert(0);
    default:
        i = 4;
        assert(0);
    }
    assert(i == 2);
    printf("SUCCESS\n");
}