diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-05 21:48:47 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-05 21:48:47 -0800 |
| commit | 9a00d2bc6fd1b62daa8b52f2b9b92d2aa8487114 (patch) | |
| tree | 163d36f515f35115aee7b852ec00bd1bddbefbe9 /src | |
| parent | 6ad7de4011f526d6d2b13292039de37547b39c46 (diff) | |
| parent | 1a84c86ce400d0a80065fa8d23a9506dc19e92f0 (diff) | |
| download | scala-9a00d2bc6fd1b62daa8b52f2b9b92d2aa8487114.tar.gz scala-9a00d2bc6fd1b62daa8b52f2b9b92d2aa8487114.tar.bz2 scala-9a00d2bc6fd1b62daa8b52f2b9b92d2aa8487114.zip | |
Merge 2.10.x into master.
Conflicts:
src/compiler/scala/tools/nsc/transform/Erasure.scala
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index e676abb86a..55b9ce1be9 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -447,6 +447,7 @@ abstract class Erasure extends AddInterfaces def checkPair(member: Symbol, other: Symbol) { val otpe = specialErasure(root)(other.tpe) val bridgeNeeded = exitingErasure ( + !member.isMacro && !(other.tpe =:= member.tpe) && !(deconstMap(other.tpe) =:= deconstMap(member.tpe)) && { var e = bridgesScope.lookupEntry(member.name) |