diff dmd/declaration.c @ 1630:44b145be2ef5

Merge dmd 1.056.
author Robert Clipsham <robert@octarineparrot.com>
date Sat, 06 Feb 2010 15:53:52 +0000
parents fb2e6707ad17
children
line wrap: on
line diff
--- a/dmd/declaration.c	Wed Jan 06 19:53:35 2010 +0100
+++ b/dmd/declaration.c	Sat Feb 06 15:53:52 2010 +0000
@@ -835,7 +835,7 @@
 	    //printf("declaring field %s of type %s\n", v->toChars(), v->type->toChars());
 	    v->semantic(sc);
             
-/*
+#if !IN_LLVM
 // removed for LDC since TupleDeclaration::toObj already creates the fields;
 // adding them to the scope again leads to duplicates
 	    if (sc->scopesym)
@@ -843,7 +843,8 @@
 		if (sc->scopesym->members)
 		    sc->scopesym->members->push(v);
 	    }
-*/
+#endif
+
 	    Expression *e = new DsymbolExp(loc, v);
 	    exps->data[i] = e;
 	}
@@ -1490,9 +1491,10 @@
 void TypeInfoDeclaration::semantic(Scope *sc)
 {
     assert(linkage == LINKc);
-    // LDC
+#if IN_LLVM
     if (!global.params.useAvailableExternally)
         availableExternally = false;
+#endif
 }
 
 /***************************** TypeInfoConstDeclaration **********************/