summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2004-01-08 17:50:46 +0000
committerMartin Odersky <odersky@gmail.com>2004-01-08 17:50:46 +0000
commit25d392bbccae66e4168fdbb0cb047cc5add15be9 (patch)
treedb25aaea5b99bfddad5823a96ce5c60eed4d2aff /sources
parent9b1c72bc8a718d4c910321828c6a582e4149139f (diff)
downloadscala-25d392bbccae66e4168fdbb0cb047cc5add15be9.tar.gz
scala-25d392bbccae66e4168fdbb0cb047cc5add15be9.tar.bz2
scala-25d392bbccae66e4168fdbb0cb047cc5add15be9.zip
*** empty log message ***
Diffstat (limited to 'sources')
-rw-r--r--sources/scala/concurrent/Channel.scala7
-rw-r--r--sources/scala/tools/scalac/typechecker/Analyzer.scala1
2 files changed, 3 insertions, 5 deletions
diff --git a/sources/scala/concurrent/Channel.scala b/sources/scala/concurrent/Channel.scala
index cc9a6a4ce4..e82568b956 100644
--- a/sources/scala/concurrent/Channel.scala
+++ b/sources/scala/concurrent/Channel.scala
@@ -2,14 +2,13 @@ package scala.concurrent;
import scala.collection.mutable.LinkedList;
-class Channel[a <: AnyRef] with Monitor {
- // !!! is this new correct ?
- private var written = new LinkedList[a](null, null);
+class Channel[a] with Monitor {
+ var dummy: a = _;
+ private var written = new LinkedList[a](dummy, null);
private var lastWritten = written;
private var nreaders = 0;
def write(x: a) = synchronized {
- // !!! is this new correct ?
lastWritten.next = new LinkedList(x, null);
lastWritten = lastWritten.next;
if (nreaders > 0) notify();
diff --git a/sources/scala/tools/scalac/typechecker/Analyzer.scala b/sources/scala/tools/scalac/typechecker/Analyzer.scala
index 155ef37c2e..5fd7997e9d 100644
--- a/sources/scala/tools/scalac/typechecker/Analyzer.scala
+++ b/sources/scala/tools/scalac/typechecker/Analyzer.scala
@@ -250,7 +250,6 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
if (isAccessible(sym, site, sitetype)) {
symtype
} else {
- System.out.println(sym.flags & (PRIVATE | PROTECTED));//debug
error(pos, "" + sym + " cannot be accessed in " + sitetype.widen());
Type.ErrorType
}