diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 10:25:59 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:24:34 -0700 |
| commit | 55990c9ec619cf212a31db4f818dedb5d3150157 (patch) | |
| tree | 8a4247660a833881bdc9fe2e2c6f38ff3fbcb158 /test/files/run/t5271_3.check | |
| parent | 3ab383ae01a66208df4955bf2117dd2ea8eb2afe (diff) | |
| download | scala-55990c9ec619cf212a31db4f818dedb5d3150157.tar.gz scala-55990c9ec619cf212a31db4f818dedb5d3150157.tar.bz2 scala-55990c9ec619cf212a31db4f818dedb5d3150157.zip | |
New starr to support new fundamental laws of reality.
And grueling recovery from branch drift.
Merges a portion (and only a portion) of topic/inline into master.
The major changes which come with this merge are:
AnyVal is unsealed, can be extended directly.
ScalaObject is no longer with us.
Diffstat (limited to 'test/files/run/t5271_3.check')
| -rw-r--r-- | test/files/run/t5271_3.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/t5271_3.check b/test/files/run/t5271_3.check index be87696f02..9331c78959 100644 --- a/test/files/run/t5271_3.check +++ b/test/files/run/t5271_3.check @@ -1,12 +1,12 @@ { - object C extends Object with ScalaObject with Serializable { + object C extends scala.AnyRef with Serializable { def <init>() = { super.<init>(); () }; def qwe: Int = 4 }; - case class C extends Object with ScalaObject with Product with Serializable { + case class C extends Object with Product with Serializable { <caseaccessor> <paramaccessor> val foo : Int = _; <caseaccessor> <paramaccessor> val bar : Int = _; def <init>(foo: Int, bar: Int) = { |