diff dmd/template.c @ 1630:44b145be2ef5

Merge dmd 1.056.
author Robert Clipsham <robert@octarineparrot.com>
date Sat, 06 Feb 2010 15:53:52 +0000
parents a87f1d6ff48e
children 9bf06e02070b
line wrap: on
line diff
--- a/dmd/template.c	Wed Jan 06 19:53:35 2010 +0100
+++ b/dmd/template.c	Sat Feb 06 15:53:52 2010 +0000
@@ -1,6 +1,6 @@
 
 // Compiler implementation of the D programming language
-// Copyright (c) 1999-2009 by Digital Mars
+// Copyright (c) 1999-2010 by Digital Mars
 // All Rights Reserved
 // written by Walter Bright
 // http://www.digitalmars.com
@@ -3539,7 +3539,8 @@
 	error("error instantiating");
 	if (tinst)
 	{   tinst->printInstantiationTrace();
-	    fatal();
+	    if (!global.gag)
+		fatal();
 	}
 	errors = 1;
 	if (global.gag)