diff dmd/template.h @ 1367:8026319762be

Merged DMD 1.045 !!!
author Tomas Lindquist Olsen <tomas.l.olsen gmail com>
date Sat, 16 May 2009 22:21:31 +0200
parents e961851fb8be
children def7a1d494fd
line wrap: on
line diff
--- a/dmd/template.h	Sat May 16 18:37:16 2009 +0200
+++ b/dmd/template.h	Sat May 16 22:21:31 2009 +0200
@@ -277,6 +277,7 @@
 
     TemplateDeclaration *tempdecl;	// referenced by foo.bar.abc
     TemplateInstance *inst;		// refer to existing instance
+    TemplateInstance *tinst;		// enclosing template instance
     ScopeDsymbol *argsym;		// argument symbol table
     AliasDeclaration *aliasdecl;	// !=NULL if instance is an alias for its
 					// sole member
@@ -308,6 +309,7 @@
     int oneMember(Dsymbol **ps);
     char *toChars();
     char *mangle();
+    void printInstantiationTrace();
 
 #if IN_DMD
     void toObjFile(int multiobj);			// compile to .obj file
@@ -327,10 +329,8 @@
 
 #if IN_LLVM
     // LDC
-    TemplateInstance *tinst; // enclosing template instance
     Module* tmodule; // module from outermost enclosing template instantiation
     Module* emittedInModule; // which module this template instance has been emitted in
-    void printInstantiationTrace();
 
     void codegen(Ir*);
 #endif