Mercurial > projects > ddmd
changeset 185:13cf8da225ce
Merge.
author | Jacob Carlborg <doob@me.com> |
---|---|
date | Tue, 02 Nov 2010 08:49:51 +0100 |
parents | 9f4e5ac4f0a3 (current diff) b64060ab22df (diff) |
children | 1a0c1126bc46 |
files | |
diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dmd/UnaExp.d Tue Nov 02 08:46:11 2010 +0100 +++ b/dmd/UnaExp.d Tue Nov 02 08:49:51 2010 +0100 @@ -77,7 +77,7 @@ e1.scanForNestedRef(sc); } - Expression interpretCommon(InterState istate, Expression *(*fp)(Type* a0, Expression* a1)) + Expression interpretCommon(InterState istate, Expression* function(Type* a0, Expression* a1)) { assert(false); }
--- a/dmd/codegen/linkhelper.d Tue Nov 02 08:46:11 2010 +0100 +++ b/dmd/codegen/linkhelper.d Tue Nov 02 08:49:51 2010 +0100 @@ -24,9 +24,9 @@ va_start(ap, format); char buf[1024]; - vsprintf(buf.ptr, format, ap); + int len = vsprintf(buf.ptr, format, ap); va_end( ap ); - dmd.Util.error(loc, to!string(buf)); + dmd.Util.error(loc, buf[0..len].idup); } }