First steps towards lifting

3 files changed, 8 insertions, 8 deletions

diff --git a/src/library/scala/reflect/package.scala b/src/library/scala/reflect/package.scala
index 3fe25316ca..eac4adcffe 100644
--- a/src/library/scala/reflect/package.scala
+++ b/src/library/scala/reflect/package.scala
@@ -4,7 +4,7 @@ package object reflect {
 
   val mirror: api.Mirror = try {
     // we use (Java) reflection here so that we can keep reflect.runtime and reflect.internals in a seperate jar
-    (java.lang.Class forName "scala.reflect.runtime.Mirror$" getField "$MODULE" get null).asInstanceOf[api.Mirror]
+    (java.lang.Class forName "scala.reflect.runtime.Mirror$" getField "MODULE$" get null).asInstanceOf[api.Mirror]
   } catch {
     case ex: NoClassDefFoundError =>
       throw new UnsupportedOperationException("Scala reflection not available on this platform")
@@ -15,4 +15,4 @@ package object reflect {
   type Tree = mirror.Tree
   */
 
-}
\ No newline at end of file
+}
diff --git a/src/library/scala/runtime/ObjectRef.java b/src/library/scala/runtime/ObjectRef.java
index a1dd3d78d9..15f2f493c7 100644
--- a/src/library/scala/runtime/ObjectRef.java
+++ b/src/library/scala/runtime/ObjectRef.java
@@ -11,10 +11,10 @@
 package scala.runtime;
 
 
-public class ObjectRef implements java.io.Serializable {
+public class ObjectRef<T> implements java.io.Serializable {
     private static final long serialVersionUID = -9055728157600312291L;
 
-    public Object elem;
-    public ObjectRef(Object elem) { this.elem = elem; }
+    public T elem;
+    public ObjectRef(T elem) { this.elem = elem; }
     public String toString() { return String.valueOf(elem); }
 }
diff --git a/src/library/scala/runtime/VolatileObjectRef.java b/src/library/scala/runtime/VolatileObjectRef.java
index 73facba978..7c393b405a 100755
--- a/src/library/scala/runtime/VolatileObjectRef.java
+++ b/src/library/scala/runtime/VolatileObjectRef.java
@@ -11,10 +11,10 @@
 package scala.runtime;
 
 
-public class VolatileObjectRef implements java.io.Serializable {
+public class VolatileObjectRef<T> implements java.io.Serializable {
     private static final long serialVersionUID = -9055728157600312291L;
 
-    volatile public Object elem;
-    public VolatileObjectRef(Object elem) { this.elem = elem; }
+    volatile public T elem;
+    public VolatileObjectRef(T elem) { this.elem = elem; }
     public String toString() { return String.valueOf(elem); }
 }