summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2010-09-23 08:48:54 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2010-09-23 08:48:54 +0000
commit0100aacc35584293272f7fe6c09ed5e3489700f8 (patch)
tree261a2d7e766a406e1362896b00cc2abd04238f3a /src/library
parent6b033dfc5e4186a8c0653b2e3495b46688a01c91 (diff)
downloadscala-0100aacc35584293272f7fe6c09ed5e3489700f8.tar.gz
scala-0100aacc35584293272f7fe6c09ed5e3489700f8.tar.bz2
scala-0100aacc35584293272f7fe6c09ed5e3489700f8.zip
Revert "CPI -> SCPI to (hopefully) fix scaladoc...
Revert "CPI -> SCPI to (hopefully) fix scaladoc failure in nightly. probably indicates a bug in scaladoc or the type checker or the spec, since abstract type members seem to be allowed in objects inconsistently across these three. no review." that was a little too hasty.. SCPI was already defined somewhere This reverts commit 165424cd9175d7e6d33bc541f2aff2575ee31121.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/parallel/ParIterableViewLike.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/parallel/ParIterableViewLike.scala b/src/library/scala/collection/parallel/ParIterableViewLike.scala
index dc7cf3f65f..1f7ea9b694 100644
--- a/src/library/scala/collection/parallel/ParIterableViewLike.scala
+++ b/src/library/scala/collection/parallel/ParIterableViewLike.scala
@@ -41,7 +41,7 @@ extends IterableView[T, Coll]
override protected[this] def newCombiner: Combiner[T, This] = throw new UnsupportedOperationException(this + ".newCombiner");
- type SCPI = SignalContextPassingIterator[ParIterator]
+ type CPI = SignalContextPassingIterator[ParIterator]
/* wrappers */