← Back to branch summary

~ubuntu-branches/debian/sid/scala/sid

« back to all changes in this revision

Viewing changes to src/library/scala/collection/generic/GenericParTemplate.scala

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg, Mehdi Dogguy, Lucas Satabin, Frank S. Thomas, Emmanuel Bourg
  • Date: 2015-06-05 23:52:59 UTC
  • mfrom: (1.2.11)
  • Revision ID: package-import@ubuntu.com-20150605235259-wk00vgk83dh8o19g
Tags: 2.10.5-1
http://bugs.debian.org/744278
http://bugs.debian.org/754935
http://bugs.debian.org/724704
* Team upload.

[ Mehdi Dogguy ]
* New upstream release (Closes: #744278).

[ Lucas Satabin ]
* Update patches
* Update the clean target
* Update paths of elements to install
* Update watch file

[ Frank S. Thomas ]
* Remove myself from Uploaders.

[ Emmanuel Bourg ]
* The package has been adopted by the Java Team (Closes: #754935)
* Patched the build to avoid downloading libraries from the Internet
* Replaced the minified JavaScript files with unobfuscated ones
* No longer build scala-partest.jar until diffutils is packaged or replaced
* debian/watch: Fixed the versions matched (x.y.z instead of x.y.z..z)
* debian/rules:
  - Added the missing get-orig-source target (Closes: #724704)
  - Improved the clean target
* debian/control:
  - Build depend on scala (>= 2.10) and bnd
  - Use canonical URLs for the Vcs-* fields
  - Standards-Version updated to 3.9.6 (no changes)
* Switch to debhelper level 9

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/library/scala/collection/generic/GenericParTemplate.scala
1
1
/*                     __                                               *\
2
2
**     ________ ___   / /  ___     Scala API                            **
3
 
**    / __/ __// _ | / /  / _ |    (c) 2003-2011, LAMP/EPFL             **
 
3
**    / __/ __// _ | / /  / _ |    (c) 2010-2013, LAMP/EPFL             **
4
4
**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
5
5
** /____/\___/_/ |_/____/_/ | |                                         **
6
6
**                          |/                                          **
8
8
 
9
9
package scala.collection.generic
10
10
 
11
 
 
12
 
 
13
11
import scala.collection.parallel.Combiner
14
12
import scala.collection.parallel.ParIterable
15
13
import scala.collection.parallel.ParMap
16
14
import scala.collection.parallel.TaskSupport
17
15
 
18
 
 
19
 
import annotation.unchecked.uncheckedVariance
20
 
 
21
 
 
22
 
 
23
 
 
24
 
 
 
16
import scala.annotation.unchecked.uncheckedVariance
 
17
import scala.language.higherKinds
25
18
 
26
19
/** A template trait for collections having a companion.
27
20
 *
28
21
 *  @tparam A    the element type of the collection
29
22
 *  @tparam CC   the type constructor representing the collection class
 
23
 *  @author Aleksandar Prokopec
30
24
 *  @since 2.8
31
 
 *  @author prokopec
32
25
 */
33
26
trait GenericParTemplate[+A, +CC[X] <: ParIterable[X]]
34
27
extends GenericTraversableTemplate[A, CC]
36
29
{
37
30
  def companion: GenericCompanion[CC] with GenericParCompanion[CC]
38
31
 
39
 
  protected[this] override def newBuilder: collection.mutable.Builder[A, CC[A]] = newCombiner
 
32
  protected[this] override def newBuilder: scala.collection.mutable.Builder[A, CC[A]] = newCombiner
40
33
 
41
34
  protected[this] override def newCombiner: Combiner[A, CC[A]] = {
42
35
    val cb = companion.newCombiner[A]
68
61
  }
69
62
}
70
63
 
71
 
 
72
 
 
73
 
 
74
 
 
75