summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2012-04-16 11:52:25 +0200
committerEugene Burmako <xeno.by@gmail.com>2012-04-17 21:27:40 +0200
commite408aa9ccaba736d0f85b7afecd288c3873d05bb (patch)
treeb115dd0261cfe4f8a2f741d1cb4afd1412886e48 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala
parent17fa0b13480c7dd9796885e32ec562e162253350 (diff)
downloadscala-e408aa9ccaba736d0f85b7afecd288c3873d05bb.tar.gz
scala-e408aa9ccaba736d0f85b7afecd288c3873d05bb.tar.bz2
scala-e408aa9ccaba736d0f85b7afecd288c3873d05bb.zip
adds erasures to concrete type tags
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index 4fb9362ccc..30a79917c9 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -1161,7 +1161,8 @@ trait Implicits {
// todo. migrate hardcoded materialization in Implicits to corresponding implicit macros
var materializer = atPos(pos.focus)(Apply(TypeApply(Ident(TagMaterializers(tagClass)), List(TypeTree(tp))), List(prefix)))
if (settings.XlogImplicits.value) println("materializing requested %s.%s[%s] using %s".format(pre, tagClass.name, tp, materializer))
- success(materializer)
+ if (context.macrosEnabled) success(materializer)
+ else failure(materializer, "macros are disabled")
}
/** The manifest corresponding to type `pt`, provided `pt` is an instance of Manifest.