diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-06-03 13:14:43 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-06-03 13:14:43 +0200 |
| commit | d17c098f35a8612496a732876663435a7f3184da (patch) | |
| tree | 627e20f0a36e69dc38bc4727f13569a0af03a7f7 /src | |
| parent | bed5c0250421dce1b79563baae7e4511b0cc34a7 (diff) | |
| parent | b3166d10b6cd5d61d1b10a4d308331d4a80aa411 (diff) | |
| download | scala-d17c098f35a8612496a732876663435a7f3184da.tar.gz scala-d17c098f35a8612496a732876663435a7f3184da.tar.bz2 scala-d17c098f35a8612496a732876663435a7f3184da.zip | |
Merge pull request #3789 from clhodapp/fix/SI-6678
SI-6678 Make currentMirror macro hygenic
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/runtime/package.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/runtime/package.scala b/src/reflect/scala/reflect/runtime/package.scala index 3c9bbccba3..e240bed0a7 100644 --- a/src/reflect/scala/reflect/runtime/package.scala +++ b/src/reflect/scala/reflect/runtime/package.scala @@ -30,7 +30,8 @@ package runtime { import c.universe._ val runtimeClass = c.reifyEnclosingRuntimeClass if (runtimeClass.isEmpty) c.abort(c.enclosingPosition, "call site does not have an enclosing class") - val runtimeUniverse = Select(Select(Select(Ident(newTermName("scala")), newTermName("reflect")), newTermName("runtime")), newTermName("universe")) + val scalaPackage = Select(Ident(newTermName("_root_")), newTermName("scala")) + val runtimeUniverse = Select(Select(Select(scalaPackage, newTermName("reflect")), newTermName("runtime")), newTermName("universe")) val currentMirror = Apply(Select(runtimeUniverse, newTermName("runtimeMirror")), List(Select(runtimeClass, newTermName("getClassLoader")))) c.Expr[Nothing](currentMirror)(c.WeakTypeTag.Nothing) } |