From 95f43c55cda94131dc668f6cefcf835483df2ae8 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Fri, 26 Aug 2016 13:43:12 +0200 Subject: [PATCH] add `override` for scala/scala#5331 --- akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala | 2 +- akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala index ba16ce0744..ddb799d136 100644 --- a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala +++ b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala @@ -239,7 +239,7 @@ class BoundedBlockingQueue[E <: AnyRef]( elements(last).asInstanceOf[E] } - def remove() { + override def remove() { if (last < 0) throw new IllegalStateException val target = elements(last) last = -1 //To avoid 2 subsequent removes without a next in between diff --git a/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala b/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala index 4727e57a7a..cc29d074ab 100644 --- a/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala +++ b/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala @@ -32,7 +32,7 @@ trait PriorityQueueStabilizer[E <: AnyRef] extends AbstractQueue[E] { private[this] val backingIterator = backingQueue.iterator() def hasNext: Boolean = backingIterator.hasNext def next(): E = backingIterator.next().element - def remove() = backingIterator.remove() + override def remove() = backingIterator.remove() } override def poll(): E = {