Merge pull request #1603 from szeiger/wip/scala-2.12.0-rc1-compatibility

add 'override' for scala/scala#5331
slick · Sep 1, 2016 · 01d3c89 · 01d3c89
2 parents 0b81b65 + f998232
commit 01d3c89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/slick/src/main/scala/slick/util/InternalArrayQueue.scala b/slick/src/main/scala/slick/util/InternalArrayQueue.scala
@@ -173,7 +173,7 @@ private[util] final class InternalArrayQueue[E >: Null <: AnyRef](capacity: Int)
       x
     }
 
-    def remove(): Unit = throw new UnsupportedOperationException
+    override def remove(): Unit = throw new UnsupportedOperationException
   }
 
 }
diff --git a/slick/src/main/scala/slick/util/ManagedArrayBlockingQueue.scala b/slick/src/main/scala/slick/util/ManagedArrayBlockingQueue.scala
@@ -209,7 +209,7 @@ class ManagedArrayBlockingQueue[E >: Null <: PrioritizedRunnable](maximumInUse:
       }
     }
 
-    def remove(): Unit = throw new UnsupportedOperationException
+    override def remove(): Unit = throw new UnsupportedOperationException
   }
 
   @inline private[this] def locked[T](f: => T) = {