# HG changeset patch
# User Robert Clipsham <robert@octarineparrot.com>
# Date 1271088152 -3600
# Node ID 1b81e14880efc640991f8a7739e18ca5a452d2c9
# Parent  460959608115a7c0b11e062fe41664bd96ebaec0
Fixed a few merge issues.

diff -r 460959608115 -r 1b81e14880ef dmd/Parser.d
--- a/dmd/Parser.d	Mon Apr 12 17:00:08 2010 +0100
+++ b/dmd/Parser.d	Mon Apr 12 17:02:32 2010 +0100
@@ -1077,17 +1077,6 @@
 	Lerr:
 		return tpl;
 	}
-<<<<<<< local
-	
-	/******************************************
-	 * Parse template mixin.
-	 *	mixin Foo;
-	 *	mixin Foo!(args);
-	 *	mixin a.b.c!(args).Foo!(args);
-	 *	mixin Foo!(args) identifier;
-	 *	mixin typeof(expr).identifier!(args);
-	 */
-=======
 
 /******************************************
  * Parse template mixin.
diff -r 460959608115 -r 1b81e14880ef dmd/TemplateAliasParameter.d
--- a/dmd/TemplateAliasParameter.d	Mon Apr 12 17:00:08 2010 +0100
+++ b/dmd/TemplateAliasParameter.d	Mon Apr 12 17:02:32 2010 +0100
@@ -4,6 +4,7 @@
 import dmd.Loc;
 import dmd.Identifier;
 import dmd.Type;
+import dmd.TypeIdentifier;
 import dmd.ArrayTypes;
 import dmd.Scope;
 import dmd.Declaration;
diff -r 460959608115 -r 1b81e14880ef dmd/TemplateMixin.d
--- a/dmd/TemplateMixin.d	Mon Apr 12 17:00:08 2010 +0100
+++ b/dmd/TemplateMixin.d	Mon Apr 12 17:02:32 2010 +0100
@@ -278,7 +278,7 @@
 		{   Dsymbol s;
 
 			s = cast(Dsymbol)members.data[i];
-			s.addMember(argscope, this, i);
+			s.addMember(argscope, this, cast(bool)i);
 			//sc.insert(s);
 			//printf("sc.parent = %p, sc.scopesym = %p\n", sc.parent, sc.scopesym);
 			//printf("s.parent = %s\n", s.parent.toChars());