summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2011-01-26 16:57:34 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2011-01-26 16:57:34 +0000
commite97169c1c300e00f1f51c6a96374bbf96e6b68e6 (patch)
tree4d7c4682cae12a29e097799ff4566ea64db3e911 /src/actors
parentb961c9bdfbec7dd0d1ab7d43197780dfa83befca (diff)
downloadscala-e97169c1c300e00f1f51c6a96374bbf96e6b68e6.tar.gz
scala-e97169c1c300e00f1f51c6a96374bbf96e6b68e6.tar.bz2
scala-e97169c1c300e00f1f51c6a96374bbf96e6b68e6.zip
workaround for see #3936, allows building every...
workaround for see #3936, allows building everything inside intellij. no review
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/threadpool/BlockingQueue.java2
-rw-r--r--src/actors/scala/actors/threadpool/LinkedBlockingQueue.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/actors/scala/actors/threadpool/BlockingQueue.java b/src/actors/scala/actors/threadpool/BlockingQueue.java
index 1b4e808d84..4b8c201b85 100644
--- a/src/actors/scala/actors/threadpool/BlockingQueue.java
+++ b/src/actors/scala/actors/threadpool/BlockingQueue.java
@@ -149,7 +149,7 @@ import java.util.Queue;
* @author Doug Lea
* @param <E> the type of elements held in this collection
*/
-public interface BlockingQueue<E> extends Queue<E> {
+public interface BlockingQueue<E> extends java.util.Queue<E> {
/**
* Inserts the specified element into this queue if it is possible to do
* so immediately without violating capacity restrictions, returning
diff --git a/src/actors/scala/actors/threadpool/LinkedBlockingQueue.java b/src/actors/scala/actors/threadpool/LinkedBlockingQueue.java
index f434ab0e7b..15f1085ec6 100644
--- a/src/actors/scala/actors/threadpool/LinkedBlockingQueue.java
+++ b/src/actors/scala/actors/threadpool/LinkedBlockingQueue.java
@@ -46,7 +46,7 @@ import java.util.NoSuchElementException;
* @param <E> the type of elements held in this collection
*
*/
-public class LinkedBlockingQueue<E> extends AbstractQueue<E>
+public class LinkedBlockingQueue<E> extends java.util.AbstractQueue<E>
implements BlockingQueue<E>, java.io.Serializable {
private static final long serialVersionUID = -6903933977591709194L;