summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/GenTraversableOnce.scala
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2012-10-03 18:06:39 +0200
committerAleksandar Prokopec <axel22@gmail.com>2012-10-04 11:32:27 +0200
commitb405a2969477f9e9a76274eac1ebda3c0f2942ad (patch)
tree067747051a075740b041b665271032cfb31eb577 /src/library/scala/collection/GenTraversableOnce.scala
parent3ffc62b49914c6bf466f0f5e10c8f34b2cff5899 (diff)
downloadscala-b405a2969477f9e9a76274eac1ebda3c0f2942ad.tar.gz
scala-b405a2969477f9e9a76274eac1ebda3c0f2942ad.tar.bz2
scala-b405a2969477f9e9a76274eac1ebda3c0f2942ad.zip
SI-6467: Zero element in aggregate now by-name
Diffstat (limited to 'src/library/scala/collection/GenTraversableOnce.scala')
-rw-r--r--src/library/scala/collection/GenTraversableOnce.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/library/scala/collection/GenTraversableOnce.scala b/src/library/scala/collection/GenTraversableOnce.scala
index a872bc0948..9167280910 100644
--- a/src/library/scala/collection/GenTraversableOnce.scala
+++ b/src/library/scala/collection/GenTraversableOnce.scala
@@ -261,11 +261,12 @@ trait GenTraversableOnce[+A] extends Any {
* @tparam B the type of accumulated results
* @param z the initial value for the accumulated result of the partition - this
* will typically be the neutral element for the `seqop` operator (e.g.
- * `Nil` for list concatenation or `0` for summation)
+ * `Nil` for list concatenation or `0` for summation) and may be evaluated
+ * more than once
* @param seqop an operator used to accumulate results within a partition
* @param combop an associative operator used to combine results from different partitions
*/
- def aggregate[B](z: B)(seqop: (B, A) => B, combop: (B, B) => B): B
+ def aggregate[B](z: =>B)(seqop: (B, A) => B, combop: (B, B) => B): B
/** Applies a binary operator to all elements of this $coll, going right to left.
* $willNotTerminateInf