summaryrefslogtreecommitdiff
path: root/src/library/scala/Proxy.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-03 10:36:17 -0800
committerPaul Phillips <paulp@improving.org>2012-02-03 12:47:19 -0800
commit8c7005fc90008b6874431d318b482c2ad985181a (patch)
treeabec4ca8192e8500df925325516ad6379c9e7b1f /src/library/scala/Proxy.scala
parent4aa290f3ba9b1b4029304f4d19e90e68ab18d781 (diff)
downloadscala-8c7005fc90008b6874431d318b482c2ad985181a.tar.gz
scala-8c7005fc90008b6874431d318b482c2ad985181a.tar.bz2
scala-8c7005fc90008b6874431d318b482c2ad985181a.zip
Eliminated ScalaObject.
"This too shall pass."
Diffstat (limited to 'src/library/scala/Proxy.scala')
-rw-r--r--src/library/scala/Proxy.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/Proxy.scala b/src/library/scala/Proxy.scala
index 16c3c3fa56..7102ed0db2 100644
--- a/src/library/scala/Proxy.scala
+++ b/src/library/scala/Proxy.scala
@@ -22,7 +22,8 @@ package scala
* @author Matthias Zenger
* @version 1.0, 26/04/2004
*/
-trait Proxy extends Any {
+// trait Proxy extends Any {
+trait Proxy {
def self: Any
override def hashCode: Int = self.hashCode