*** empty log message ***

3 files changed, 8 insertions, 8 deletions

diff --git a/sources/scalac/typechecker/AnalyzerPhase.java b/sources/scalac/typechecker/AnalyzerPhase.java
index 1c972e6cab..7104adfd03 100644
--- a/sources/scalac/typechecker/AnalyzerPhase.java
+++ b/sources/scalac/typechecker/AnalyzerPhase.java
@@ -11,7 +11,7 @@ package scalac.typechecker;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.ast.TreeGen;
 import scalac.symtab.Definitions;
 import scalac.symtab.Symbol;
@@ -29,6 +29,6 @@ public abstract class AnalyzerPhase extends Phase {
 
     public abstract void addConsoleImport(Symbol module);
 
-    public abstract void lateEnter(Unit unit);
+    public abstract void lateEnter(CompilationUnit unit);
 
 }
diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java
index 4a8f1d78e4..797d38fc08 100644
--- a/sources/scalac/typechecker/RefCheck.java
+++ b/sources/scalac/typechecker/RefCheck.java
@@ -43,12 +43,12 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
         super(global);
     }
 
-    private Unit unit;
+    private CompilationUnit unit;
     private Definitions defs = global.definitions;
     private Infer infer = global.newInfer();
     private Symbol enclClass;
 
-    public void apply(Unit unit) {
+    public void apply(CompilationUnit unit) {
 	this.unit = unit;
 	level = 0;
 	scopes[0] = new Scope();
@@ -120,8 +120,8 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 		    switch (member1.info()) {
 		    case OverloadedType(Symbol[] alts, _):
 			for (int i = 0; i < alts.length; i++) {
-			    if (normalizedInfo(self, alts[i]).isSubType(template) &&
-				alts[i].owner() == member1.owner()) {
+			    if (normalizedInfo(self, alts[i]).isSubType(template) /*&&
+                                                                                    alts[i].owner() == member1.owner()*/) {
 				if (member == other)
 				    member = alts[i];
 				else
@@ -159,7 +159,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 		}
 		abstractClassError(
 		    clazz,
-		    member.toString() + member.type() + member.locationString() + " is not defined" +
+		    member.toString() + member.locationString() + " is not defined" +
 		    (((member.flags & MUTABLE) == 0) ? ""
 		     : "\n(Note that variables need to be initialized to be defined)"));
 	    } else if (member.isAbstractOverride()) {
diff --git a/sources/scalac/typechecker/RefCheckPhase.java b/sources/scalac/typechecker/RefCheckPhase.java
index ca73d37d6d..3f783650f4 100644
--- a/sources/scalac/typechecker/RefCheckPhase.java
+++ b/sources/scalac/typechecker/RefCheckPhase.java
@@ -21,7 +21,7 @@ public class RefCheckPhase extends Phase {
     }
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         for (int i = 0; i < units.length; i++)
             new RefCheck(global).apply(units[i]);
     }