diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-04 13:01:05 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-02-04 13:01:05 -0800 |
commit | 6abac73c21275bd6b202ffcfc9193110bcc9a1f9 (patch) | |
tree | 05128dcc39644888f26353b890c75fc2ff433f22 /src/library | |
parent | 3a6b1124f18acf95923e228f6f41bdf3c23e0173 (diff) | |
download | scala-6abac73c21275bd6b202ffcfc9193110bcc9a1f9.tar.gz scala-6abac73c21275bd6b202ffcfc9193110bcc9a1f9.tar.bz2 scala-6abac73c21275bd6b202ffcfc9193110bcc9a1f9.zip |
Having Proxy extend Any as well.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/Proxy.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/library/scala/Proxy.scala b/src/library/scala/Proxy.scala index 7102ed0db2..604b2a299f 100644 --- a/src/library/scala/Proxy.scala +++ b/src/library/scala/Proxy.scala @@ -22,8 +22,7 @@ package scala * @author Matthias Zenger * @version 1.0, 26/04/2004 */ -// trait Proxy extends Any { -trait Proxy { +trait Proxy extends Any { def self: Any override def hashCode: Int = self.hashCode @@ -39,7 +38,7 @@ trait Proxy { object Proxy { /** A proxy which exposes the type it is proxying for via a type parameter. */ - trait Typed[T] extends /*Any with */Proxy { + trait Typed[T] extends Any with Proxy { def self: T } } |