From 91a0dbe0369ab38f4da8999deb8d6ec82c3e731c Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Fri, 27 Feb 2015 16:33:25 +0100 Subject: [PATCH] Graph#Shape needs uncheckedVariance in 2.11 --- .../rst/scala/code/docs/stream/FlowGraphDocSpec.scala | 2 +- akka-stream/src/main/scala/akka/stream/Graph.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala index 3f7d8a1e97..f0e8ec0651 100644 --- a/akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala @@ -208,7 +208,7 @@ class FlowGraphDocSpec extends AkkaSpec { import FanInShape.Init class PriorityWorkerPoolShape2[In, Out](_init: Init[Out] = Name("PriorityWorkerPool")) - extends FanInShape[Out](_init) { + extends FanInShape[Out](_init) { protected override def construct(i: Init[Out]) = new PriorityWorkerPoolShape2(i) val jobsIn = newInlet[In]("jobsIn") diff --git a/akka-stream/src/main/scala/akka/stream/Graph.scala b/akka-stream/src/main/scala/akka/stream/Graph.scala index 790e27e777..edab6d8b41 100644 --- a/akka-stream/src/main/scala/akka/stream/Graph.scala +++ b/akka-stream/src/main/scala/akka/stream/Graph.scala @@ -4,12 +4,13 @@ package akka.stream import akka.stream.impl.StreamLayout +import scala.annotation.unchecked.uncheckedVariance trait Graph[+S <: Shape, +M] { /** * Type-level accessor for the shape parameter of this graph. */ - type Shape = S + type Shape = S @uncheckedVariance /** * The shape of a graph is all that is externally visible: its inlets and outlets. */