summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authorMatthias Zenger <mzenger@gmail.com>2003-06-12 10:50:26 +0000
committerMatthias Zenger <mzenger@gmail.com>2003-06-12 10:50:26 +0000
commitbacea50d7ace8594284a7a21a23ab3c5245e0d86 (patch)
tree338c5324fe9e87c99bbd37d8e3ee1b37c3d4df25 /sources
parentdfcf91626f605eb53a2a2fd116ee784cab11eda9 (diff)
downloadscala-bacea50d7ace8594284a7a21a23ab3c5245e0d86.tar.gz
scala-bacea50d7ace8594284a7a21a23ab3c5245e0d86.tar.bz2
scala-bacea50d7ace8594284a7a21a23ab3c5245e0d86.zip
Adapted the code to the new Monitor trait.
Diffstat (limited to 'sources')
-rw-r--r--sources/scala/concurrent/Channel.scala2
-rw-r--r--sources/scala/concurrent/Lock.scala2
-rw-r--r--sources/scala/concurrent/MailBox.scala2
-rw-r--r--sources/scala/concurrent/SyncChannel.scala2
-rw-r--r--sources/scala/concurrent/SyncVar.scala2
5 files changed, 5 insertions, 5 deletions
diff --git a/sources/scala/concurrent/Channel.scala b/sources/scala/concurrent/Channel.scala
index fee66786ab..0ebc751081 100644
--- a/sources/scala/concurrent/Channel.scala
+++ b/sources/scala/concurrent/Channel.scala
@@ -1,6 +1,6 @@
package scala.concurrent;
-class Channel[a] extends Monitor {
+class Channel[a] with Monitor {
private var written: LinkedList[a] = new LinkedList;
private var lastWritten = written;
private var nreaders = 0;
diff --git a/sources/scala/concurrent/Lock.scala b/sources/scala/concurrent/Lock.scala
index 48431ff110..c92aab9b7c 100644
--- a/sources/scala/concurrent/Lock.scala
+++ b/sources/scala/concurrent/Lock.scala
@@ -1,6 +1,6 @@
package scala.concurrent;
-class Lock extends Monitor {
+class Lock with Monitor {
var available = true;
def acquire = {
if (!available) wait();
diff --git a/sources/scala/concurrent/MailBox.scala b/sources/scala/concurrent/MailBox.scala
index 576d203d89..fb50b515c9 100644
--- a/sources/scala/concurrent/MailBox.scala
+++ b/sources/scala/concurrent/MailBox.scala
@@ -1,6 +1,6 @@
package scala.concurrent;
-class MailBox extends Monitor {
+class MailBox with Monitor {
type Message = AnyRef;
diff --git a/sources/scala/concurrent/SyncChannel.scala b/sources/scala/concurrent/SyncChannel.scala
index 7f0680487d..34de081647 100644
--- a/sources/scala/concurrent/SyncChannel.scala
+++ b/sources/scala/concurrent/SyncChannel.scala
@@ -1,6 +1,6 @@
package scala.concurrent;
-class SyncChannel[a] extends Monitor {
+class SyncChannel[a] with Monitor {
private var data: a = _;
private var reading = false;
private var writing = false;
diff --git a/sources/scala/concurrent/SyncVar.scala b/sources/scala/concurrent/SyncVar.scala
index 4c1c6864bd..ead0d1635c 100644
--- a/sources/scala/concurrent/SyncVar.scala
+++ b/sources/scala/concurrent/SyncVar.scala
@@ -1,6 +1,6 @@
package scala.concurrent;
-class SyncVar[a] extends Monitor {
+class SyncVar[a] with Monitor {
private var isDefined: Boolean = false;
private var value: a = _;
def get = synchronized {