diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-01 17:53:06 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-01 17:53:06 -0800 |
| commit | 29128012800ac99e05552b0d52246c2691f18b83 (patch) | |
| tree | e2c126dd7ffbe5fede4f0d46d57b3bfb597b8fdc /src/compiler/scala/tools/nsc/typechecker/Macros.scala | |
| parent | a75cb0adbd919d762381de983d795e1f9723e37c (diff) | |
| parent | 01eb6f4958b64667dfae6240effa55d44fa0d392 (diff) | |
| download | scala-29128012800ac99e05552b0d52246c2691f18b83.tar.gz scala-29128012800ac99e05552b0d52246c2691f18b83.tar.bz2 scala-29128012800ac99e05552b0d52246c2691f18b83.zip | |
Merge commit '01eb6f4958' into wip/fresh-merge2
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Macros.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Macros.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Macros.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala index fb8d6b934f..7d6d47b410 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala @@ -450,7 +450,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces { if (aparam.name != rparam.name && !rparam.isSynthetic) MacroImplParamNameMismatchError(aparam, rparam) if (isRepeated(aparam) ^ isRepeated(rparam)) MacroImplVarargMismatchError(aparam, rparam) val aparamtpe = aparam.tpe.dealias match { - case RefinedType(List(tpe), Scope(sym)) if tpe =:= MacroContextClass.tpe && sym.allOverriddenSymbols.contains(MacroContextPrefixType) => tpe + case RefinedType(List(tpe), Scope(sym)) if tpe == MacroContextClass.tpe && sym.allOverriddenSymbols.contains(MacroContextPrefixType) => tpe case tpe => tpe } checkMacroImplParamTypeMismatch(atpeToRtpe(aparamtpe), rparam) |