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

// delegate

module typeinfo1.ti_delegate;

alias void delegate(int) dg;

class TypeInfo_D : TypeInfo
{
    hash_t getHash(void *p)
    {	long l = *cast(long *)p;

	return cast(uint)(l + (l >> 32));
    }

    int equals(void *p1, void *p2)
    {
	return *cast(dg *)p1 == *cast(dg *)p2;
    }

    size_t tsize()
    {
	return dg.sizeof;
    }

    void swap(void *p1, void *p2)
    {
	dg t;

	t = *cast(dg *)p1;
	*cast(dg *)p1 = *cast(dg *)p2;
	*cast(dg *)p2 = t;
    }

    uint flags()
    {
	return 1;
    }
}