| changeset 185: |
13cf8da225ce |
| parent 184: | 9f4e5ac4f0a3 |
|---|
| parent 182: | b64060ab22df |
| child 186: | 1a0c1126bc46 |
| author: |
Jacob Carlborg <doob@me.com> |
| date: |
Tue Nov 02 08:49:51 2010 +0100 (2 years ago) |
| files: |
|
| description: |
Merge. |
--- 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 @@ version (LOGSEMANTIC) {
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 @@ extern(C++)
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);
}
}
--- a/setupenv.bat Tue Nov 02 08:46:11 2010 +0100
+++ b/setupenv.bat Tue Nov 02 08:49:51 2010 +0100
@@ -1,1 +1,1 @@ set path=c:\dm\bin;c:\dmd2.049\windows\b
-set path=c:\dm\bin;c:\dmd2.049\windows\bin;%PATH%
\ No newline at end of file
+set path=c:\dm\bin;c:\dmd2.050\windows\bin;%PATH%
\ No newline at end of file