summaryrefslogtreecommitdiff
path: root/test/files/scalap/traitObject/result.test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-02-06 18:16:12 +0100
committerMartin Odersky <odersky@gmail.com>2012-02-06 18:16:12 +0100
commit0559b62b2d3f528eefdcda505127a59358e75599 (patch)
treee216ef7ef2796b35980f8cd037c5b42c1c2939ae /test/files/scalap/traitObject/result.test
parenta6790f969f802f726f0f3e6ef2d7ea1ecc93b9f5 (diff)
downloadscala-0559b62b2d3f528eefdcda505127a59358e75599.tar.gz
scala-0559b62b2d3f528eefdcda505127a59358e75599.tar.bz2
scala-0559b62b2d3f528eefdcda505127a59358e75599.zip
Fixed a bunch of scalap check files to account for absence of ScalaObject
Diffstat (limited to 'test/files/scalap/traitObject/result.test')
-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..d0521043c8 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 {
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 */ }
}