*boxContext => *box.Context , *boxMacro => *box.Macro

Performs the following renamings:
* scala.reflect.macros.BlackboxContext to scala.reflect.macros.blackbox.Context
* scala.reflect.macros.BlackboxMacro to scala.reflect.macros.blackbox.Macro
* scala.reflect.macros.WhiteboxContext to scala.reflect.macros.whitebox.Context
* scala.reflect.macros.WhiteboxMacro to scala.reflect.macros.whitebox.Macro

https://groups.google.com/forum/#!topic/scala-internals/MX40-dM28rk

1 files changed, 6 insertions, 6 deletions

diff --git a/test/files/run/macro-expand-overload/Impls_1.scala b/test/files/run/macro-expand-overload/Impls_1.scala
index ea68e9eb93..ef9d01d4ed 100644
--- a/test/files/run/macro-expand-overload/Impls_1.scala
+++ b/test/files/run/macro-expand-overload/Impls_1.scala
@@ -1,15 +1,15 @@
-import scala.reflect.macros.{BlackboxContext => Ctx}
+import scala.reflect.macros.blackbox.Context
 
 object Impls {
-  def impl(c: Ctx)(tag: String, x: c.Expr[_]) = {
+  def impl(c: Context)(tag: String, x: c.Expr[_]) = {
     import c.{prefix => prefix}
     import c.universe._
     val body = Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant(tag)), Literal(Constant(prefix.toString)), x.tree))
     c.Expr[Unit](body)
   }
 
-  def fooObjectString(c: Ctx)(x: c.Expr[_]) = impl(c)("fooObjectString", x)
-  def fooObjectInt(c: Ctx)(x: c.Expr[_]) = impl(c)("fooObjectInt", x)
-  def fooClassString(c: Ctx)(x: c.Expr[_]) = impl(c)("fooClassString", x)
-  def fooClassInt(c: Ctx)(x: c.Expr[_]) = impl(c)("fooClassInt", x)
+  def fooObjectString(c: Context)(x: c.Expr[_]) = impl(c)("fooObjectString", x)
+  def fooObjectInt(c: Context)(x: c.Expr[_]) = impl(c)("fooObjectInt", x)
+  def fooClassString(c: Context)(x: c.Expr[_]) = impl(c)("fooClassString", x)
+  def fooClassInt(c: Context)(x: c.Expr[_]) = impl(c)("fooClassInt", x)
 }
\ No newline at end of file