diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-06 11:37:35 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-06 11:49:38 -0800 |
| commit | 7539c4ee51c25a684399cd5400bf0285e6508fe2 (patch) | |
| tree | 94a9eb9b9519417d1924711f56638a4be02f4a2b /test/files/run/reify_this.scala | |
| parent | f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c (diff) | |
| parent | 93c2d93f4e7aaffaac92bdf14714a6c3871718c9 (diff) | |
| download | scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.tar.gz scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.tar.bz2 scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.zip | |
Merge branch 'master' into topic/inline
Conflicts:
src/compiler/scala/tools/nsc/Global.scala
test/files/run/programmatic-main.check
Diffstat (limited to 'test/files/run/reify_this.scala')
| -rw-r--r-- | test/files/run/reify_this.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/reify_this.scala b/test/files/run/reify_this.scala index 38ef72b6eb..44a25ae1b6 100644 --- a/test/files/run/reify_this.scala +++ b/test/files/run/reify_this.scala @@ -5,7 +5,7 @@ import scala.tools.nsc.Settings import reflect.runtime.Mirror.ToolBox trait Eval { - def eval(code: Code[_]): Any = eval(code.tree) + def eval(code: Code): Any = eval(code.tree) def eval(tree: Tree): Any = { val settings = new Settings |