From 6abac73c21275bd6b202ffcfc9193110bcc9a1f9 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Sat, 4 Feb 2012 13:01:05 -0800
Subject: Having Proxy extend Any as well.

---
 src/library/scala/Proxy.scala | 5 ++---
 1 file 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
   }
 }
-- 
cgit v1.2.3