Mercurial > projects > ldc

diff dmd/staticassert.c @ 1615:3da302cc4966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge DMD r294: bugzilla 2816 Sudden-death static assert is not... bugzilla 2816 Sudden-death static assert is not very useful. --- dmd/expression.h | 12 ++++++ dmd/staticassert.c | 10 +--- dmd/template.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- dmd/template.h | 2 + 4 files changed, 117 insertions(+), 15 deletions(-)
author Leandro Lucarella <llucax@gmail.com>
date Wed, 06 Jan 2010 15:18:21 -0300
parents 1b24e9c7cc26
children
line wrap: on
line diff
--- a/dmd/staticassert.c	Wed Jan 06 15:18:21 2010 -0300
+++ b/dmd/staticassert.c	Wed Jan 06 15:18:21 2010 -0300
@@ -18,6 +18,7 @@
 #include "hdrgen.h"
 #include "scope.h"
 #include "template.h"
+#include "declaration.h"
 
 
 /********************************* AttribDeclaration ****************************/
@@ -48,10 +49,6 @@
 {
 }
 
-#include "scope.h"
-#include "template.h"
-#include "declaration.h"
-
 void StaticAssert::semantic2(Scope *sc)
 {
     Expression *e;
@@ -73,11 +70,10 @@
 	}
 	else
 	    error("(%s) is false", exp->toChars());
-		if(sc->tinst)
+	if (sc->tinst)
 	    sc->tinst->printInstantiationTrace();
-	  if (!global.gag) {
+	if (!global.gag)
 	      fatal();
-	  }
     }
     else if (!e->isBool(TRUE))
     {