projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
58e173c
)
Degrade wrong override member to virtual instead of non-virtual
author
Marek Safar
<marek.safar@gmail.com>
Tue, 25 Jan 2011 10:31:35 +0000
(10:31 +0000)
committer
Marek Safar
<marek.safar@gmail.com>
Tue, 25 Jan 2011 10:44:19 +0000
(10:44 +0000)
mcs/mcs/import.cs
patch
|
blob
|
history
diff --git
a/mcs/mcs/import.cs
b/mcs/mcs/import.cs
index e3ada6de4f25359382ad5d09b654033892a91685..b85f6b07bb4d8eb5e90f95ae5d033bb852b9a08b 100644
(file)
--- a/
mcs/mcs/import.cs
+++ b/
mcs/mcs/import.cs
@@
-397,6
+397,7
@@
namespace Mono.CSharp
const Modifiers conflict_mask = Modifiers.AccessibilityMask & ~Modifiers.INTERNAL;
if (candidate == null || (candidate.Modifiers & conflict_mask) != (mod & conflict_mask) || candidate.IsStatic) {
mod &= ~Modifiers.OVERRIDE;
+ mod |= Modifiers.VIRTUAL;
}
}
}