From fa910e3648705f793bae26c02e2617e59b32f330 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Wed, 6 Jan 2010 15:18:20 -0300 Subject: [PATCH] Merge DMD r262: bugzilla 3381 ([tdpl] Incorrect assessment of ...) The full bug title is: [tdpl] Incorrect assessment of overriding in triangular-shaped hierarchy. --- dmd/class.c | 2 +- dmd/func.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) --- dmd/func.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dmd/func.c b/dmd/func.c index 03b2724f..4db0341a 100644 --- a/dmd/func.c +++ b/dmd/func.c @@ -994,6 +994,8 @@ void FuncDeclaration::semantic3(Scope *sc) v = new VarDeclaration(loc, type->nextOf(), outId, NULL); v->noscope = 1; #if DMDV2 + if (!isVirtual()) + v->storage_class |= STCconst; if (f->isref) { v->storage_class |= STCref | STCforeach;