summaryrefslogtreecommitdiff
path: root/test/files/scalap/traitObject
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-04 21:18:19 -0800
committerPaul Phillips <paulp@improving.org>2012-02-04 21:20:40 -0800
commit84bf74e3346a5b42199572930d303900a3675b22 (patch)
treeaf093799078fd9cdab049e699ae7092129817672 /test/files/scalap/traitObject
parent6ba9411c7c6abdbd907ca93208ac58b474b201d0 (diff)
downloadscala-84bf74e3346a5b42199572930d303900a3675b22.tar.gz
scala-84bf74e3346a5b42199572930d303900a3675b22.tar.bz2
scala-84bf74e3346a5b42199572930d303900a3675b22.zip
Fixed all but one of the scalap tests.
Diffstat (limited to 'test/files/scalap/traitObject')
-rw-r--r--test/files/scalap/traitObject/result.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject/result.test
index 0d7de1535d..e9a72316e9 100644
--- a/test/files/scalap/traitObject/result.test
+++ b/test/files/scalap/traitObject/result.test
@@ -1,8 +1,8 @@
-trait TraitObject extends java.lang.Object with scala.ScalaObject {
+trait TraitObject extends java.lang.Object with scala.AnyRef {
def $init$() : scala.Unit = { /* compiled code */ }
def foo : scala.Int = { /* compiled code */ }
}
-object TraitObject extends java.lang.Object with scala.ScalaObject {
+object TraitObject extends java.lang.Object {
def this() = { /* compiled code */ }
def bar : scala.Int = { /* compiled code */ }
}