Automated merge with http://hg.dsource.org/projects/ldc

dmd/template.c

@@ -4577,4 +4577,5 @@ void TemplateMixin::toObjFile(int multiobj)
     //printf("TemplateMixin::toObjFile('%s')\n", toChars());
     TemplateInstance::toObjFile(multiobj);
 }
-#endif
+#endif
+

dmd/template.h

@@ -380,3 +380,4 @@ Dsymbol *getDsymbol(Object *o);
 void ObjectToCBuffer(OutBuffer *buf, HdrGenState *hgs, Object *oarg);
 
 #endif /* DMD_TEMPLATE_H */
+

gen/optimizer.h

@@ -11,4 +11,5 @@ int optLevel();
 
 bool optimize();
 
-#endif
+#endif
+