raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Graph#Shape needs uncheckedVariance in 2.11

Browse source
This commit is contained in:
Roland Kuhn 2015-02-27 16:33:25 +01:00
parent fd621ebc36
commit 91a0dbe036
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs-dev/rst/scala/code/docs/stream/FlowGraphDocSpec.scala
View file

@ -208,7 +208,7 @@ class FlowGraphDocSpec extends AkkaSpec {
import FanInShape.Init import FanInShape.Init
class PriorityWorkerPoolShape2[In, Out](_init: Init[Out] = Name("PriorityWorkerPool")) 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) protected override def construct(i: Init[Out]) = new PriorityWorkerPoolShape2(i)
val jobsIn = newInlet[In]("jobsIn") val jobsIn = newInlet[In]("jobsIn")

3
akka-stream/src/main/scala/akka/stream/Graph.scala
View file

@ -4,12 +4,13 @@
package akka.stream package akka.stream
import akka.stream.impl.StreamLayout import akka.stream.impl.StreamLayout
import scala.annotation.unchecked.uncheckedVariance
trait Graph[+S <: Shape, +M] { trait Graph[+S <: Shape, +M] {
/** /**
* Type-level accessor for the shape parameter of this graph. * 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. * The shape of a graph is all that is externally visible: its inlets and outlets.
*/ */