merge D2 pull dlang#1067

WalterBright · WalterBright · commit e6d4b3b58b61 · 2012-07-28T14:36:06.000-07:00
diff --git a/src/class.c b/src/class.c
@@ -619,9 +619,10 @@ void ClassDeclaration::semantic(Scope *sc)
         if (s->isEnumDeclaration() ||
             (s->isAggregateDeclaration() && s->ident) ||
             s->isTemplateMixin() ||
+            s->isAttribDeclaration() ||
             s->isAliasDeclaration())
         {
-            //printf("setScope %s %s\n", s->kind(), s->toChars());
+            //printf("[%d] setScope %s %s, sc = %p\n", i, s->kind(), s->toChars(), sc);
             s->setScope(sc);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -619,9 +619,10 @@ void ClassDeclaration::semantic(Scope *sc)`
`619`	`619`	`if (s->isEnumDeclaration() \|\|`
`620`	`620`	`(s->isAggregateDeclaration() && s->ident) \|\|`
`621`	`621`	`s->isTemplateMixin() \|\|`
	`622`	`+ s->isAttribDeclaration() \|\|`
`622`	`623`	`s->isAliasDeclaration())`
`623`	`624`	`{`
`624`		`- //printf("setScope %s %s\n", s->kind(), s->toChars());`
	`625`	`+ //printf("[%d] setScope %s %s, sc = %p\n", i, s->kind(), s->toChars(), sc);`
`625`	`626`	`s->setScope(sc);`
`626`	`627`	`}`
`627`	`628`	`}`