diff dmd/Type.d @ 110:12c0c84d13fd

merged in 2.036 changes
author Trass3r
date Tue, 31 Aug 2010 22:29:00 +0200
parents 5c859d5fbe27 3a0b150c9841
children 3482c73a991b
line wrap: on
line diff
--- a/dmd/Type.d	Tue Aug 31 22:08:52 2010 +0200
+++ b/dmd/Type.d	Tue Aug 31 22:29:00 2010 +0200
@@ -1928,7 +1928,7 @@
 				// foo(U:U) shared(T)					=> shared(T)
 				// foo(U:U) const(shared(T))			=> const(shared(T))
 				if (!at)
-				{   dedtypes.data[i] = cast(void *)tt;
+				{   dedtypes[i] = tt;
 					goto Lexact;
 				}
 				break;
@@ -1943,7 +1943,8 @@
 				// foo(U:const(shared(U))	const(shared(T))=> T
 				tt = mutableOf().unSharedOf();
 				if (!at)
-				{   dedtypes.data[i] = cast(void *)tt;
+				{
+					dedtypes[i] = tt;
 					goto Lexact;
 				}
 				break;
@@ -1958,7 +1959,7 @@
 				// foo(U:const(shared(U))	immutable(T)		=> T
 				tt = mutableOf();
 				if (!at)
-				{   dedtypes.data[i] = cast(void *)tt;
+				{   dedtypes[i] = tt;
 					goto Lconst;
 				}
 				break;
@@ -1969,7 +1970,7 @@
 				// foo(U:const(shared(U))	shared(T)			=> T
 				tt = unSharedOf();
 				if (!at)
-				{   dedtypes.data[i] = cast(void *)tt;
+				{   dedtypes[i] = tt;
 					goto Lconst;
 				}
 				break;