summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-20 07:47:59 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-20 07:47:59 -0700
commitaca8c1efdb11ec598aa1b2bd94af33c0bb71c9a9 (patch)
treea29a931144a1b293ce80d4fe74302dda5820dfa0 /test/files/neg
parent952cb61108faf1a68e58ee95460e9b3bcad40ea8 (diff)
parentb5f721fb52767d0b839a0ef4614d1bcb039adba1 (diff)
downloadscala-aca8c1efdb11ec598aa1b2bd94af33c0bb71c9a9.tar.gz
scala-aca8c1efdb11ec598aa1b2bd94af33c0bb71c9a9.tar.bz2
scala-aca8c1efdb11ec598aa1b2bd94af33c0bb71c9a9.zip
Merge pull request #936 from scalamacros/ticket/5999
SI-5999 consistent behavior for c.reify and c.universe.reify
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/macro-cyclic.check8
-rw-r--r--test/files/neg/macro-cyclic/Impls_Macros_1.scala2
2 files changed, 5 insertions, 5 deletions
diff --git a/test/files/neg/macro-cyclic.check b/test/files/neg/macro-cyclic.check
index 608381e0e8..7978ec64a5 100644
--- a/test/files/neg/macro-cyclic.check
+++ b/test/files/neg/macro-cyclic.check
@@ -1,4 +1,4 @@
-Impls_Macros_1.scala:5: error: could not find implicit value for parameter e: SourceLocation
- c.reify { implicitly[SourceLocation] }
- ^
-one error found
+Impls_Macros_1.scala:5: error: could not find implicit value for parameter e: SourceLocation
+ c.universe.reify { implicitly[SourceLocation] }
+ ^
+one error found
diff --git a/test/files/neg/macro-cyclic/Impls_Macros_1.scala b/test/files/neg/macro-cyclic/Impls_Macros_1.scala
index 1ea06fc968..2ecdc3416e 100644
--- a/test/files/neg/macro-cyclic/Impls_Macros_1.scala
+++ b/test/files/neg/macro-cyclic/Impls_Macros_1.scala
@@ -2,7 +2,7 @@ import scala.reflect.makro.Context
object Macros {
def impl(c: Context) = {
- c.reify { implicitly[SourceLocation] }
+ c.universe.reify { implicitly[SourceLocation] }
}
implicit def sourceLocation: SourceLocation1 = macro impl