diff options
| author | aclement <aclement> | 2005-11-16 15:59:15 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2005-11-16 15:59:15 +0000 |
| commit | abb5d6c097d8c0ec8f33dc95342732855148bb18 (patch) | |
| tree | 7898c0ffad8509a6aa3894f17449544b75522669 /weaver | |
| parent | 887fab820369d0fdefd14ef7cffe66014c1e6843 (diff) | |
| download | aspectj-abb5d6c097d8c0ec8f33dc95342732855148bb18.tar.gz aspectj-abb5d6c097d8c0ec8f33dc95342732855148bb18.zip | |
next round of fixes for list bug reported by Alexandru.
Diffstat (limited to 'weaver')
| -rw-r--r-- | weaver/src/org/aspectj/weaver/ResolvedType.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java index 34a7b05e2..e4cbb5be7 100644 --- a/weaver/src/org/aspectj/weaver/ResolvedType.java +++ b/weaver/src/org/aspectj/weaver/ResolvedType.java @@ -1424,7 +1424,10 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl private boolean compareToExistingMembers(ConcreteTypeMunger munger, Iterator existingMembers) { ResolvedMember sig = munger.getSignature(); while (existingMembers.hasNext()) { + ResolvedMember existingMember = (ResolvedMember)existingMembers.next(); + // don't worry about clashing with bridge methods + if (existingMember.isBridgeMethod()) continue; //System.err.println("Comparing munger: "+sig+" with member "+existingMember); if (conflictingSignature(existingMember, munger.getSignature())) { //System.err.println("conflict: existingMember=" + existingMember + " typeMunger=" + munger); @@ -1501,7 +1504,6 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl } boolean incompatibleReturnTypes = false; - // In 1.5 mode, allow for covariance on return type if (world.isInJava5Mode() && parent.getKind()==Member.METHOD) { |