summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Macros.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
index 322b9ebb25..b7043e58de 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
@@ -26,7 +26,7 @@ import java.lang.reflect.{Array => jArray, Method => jMethod}
* def fooBar[T: c.TypeTag]
* (c: scala.reflect.makro.Context)
* (xs: c.Expr[List[T]])
- * : c.Tree = {
+ * : c.Expr[T] = {
* ...
* }
*
@@ -601,7 +601,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces {
if (settings.XmacroPrimaryClasspath.value != "") {
macroLogVerbose("primary macro classloader: initializing from -Xmacro-primary-classpath: %s".format(settings.XmacroPrimaryClasspath.value))
- val classpath = toURLs(settings.XmacroFallbackClasspath.value)
+ val classpath = toURLs(settings.XmacroPrimaryClasspath.value)
ScalaClassLoader.fromURLs(classpath, self.getClass.getClassLoader)
} else {
macroLogVerbose("primary macro classloader: initializing from -cp: %s".format(global.classPath.asURLs))