# HG changeset patch
# User Jacob Carlborg <doob@me.com>
# Date 1288684191 -3600
# Node ID 13cf8da225ce3bcc0b574aee13c2fb48cc745de1
# Parent  9f4e5ac4f0a3283787ccc0e740192a418536fc00# Parent  b64060ab22dfd21711c9badaa853a3af7d6e5fff
Merge.

diff -r 9f4e5ac4f0a3 -r 13cf8da225ce dmd/UnaExp.d
--- 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);
 	}
diff -r 9f4e5ac4f0a3 -r 13cf8da225ce dmd/codegen/linkhelper.d
--- 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);
 	}
 }
diff -r 9f4e5ac4f0a3 -r 13cf8da225ce setupenv.bat
--- 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\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