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*, ...);

version=AndAnd;
version=OrOr;

version(AndAnd)
void andand1()
{
    int a,b;
    a = 4;
    b = 5;
    assert(a == 4);
    assert(b == 5);
    assert(a+b == 9);
    assert(a == 4 && b == 5);
    assert(a != 3 && b == 5);
    assert(a > 2);
    assert(a < 54);
    assert(a < b);
    assert(a > b-2);
    
    int apb = a+b;
    int amb = a*b;
    assert(apb < amb && apb > a);
}

version(OrOr)
void oror1()
{
    int a,b;
    a = 10;
    b = 1000;
    assert(a);
    assert(b);
    assert(a || b);
    assert(a > b || a < b);
}

void main()
{
    printf("Conditionals test\n");
    version(AndAnd) andand1();
    version(OrOr) oror1();
    printf("  SUCCESS\n");
}