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

// ubyte

module typeinfo1.ti_ubyte;

class TypeInfo_h : TypeInfo
{
    char[] toString() { return "ubyte"; }

    hash_t getHash(void *p)
    {
	return *cast(ubyte *)p;
    }

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

    int compare(void *p1, void *p2)
    {
	return *cast(ubyte *)p1 - *cast(ubyte *)p2;
    }

    size_t tsize()
    {
	return ubyte.sizeof;
    }

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

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

class TypeInfo_b : TypeInfo_h
{
    char[] toString() { return "bool"; }
}