diff options
author | Aleksandar Prokopec <axel22@gmail.com> | 2012-03-15 09:10:47 +0100 |
---|---|---|
committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-03-15 09:10:47 +0100 |
commit | 6bd9b60b28d76738311232a15c5a959b6a57b6ca (patch) | |
tree | 887978cf034688783b9a800d1a0a81a4362a3d9a /src/library | |
parent | 9e6ffde8acc48a369a85b3c86f692916ecfb3d37 (diff) | |
download | scala-6bd9b60b28d76738311232a15c5a959b6a57b6ca.tar.gz scala-6bd9b60b28d76738311232a15c5a959b6a57b6ca.tar.bz2 scala-6bd9b60b28d76738311232a15c5a959b6a57b6ca.zip |
Remove some custom serialization boilerplate.
Diffstat (limited to 'src/library')
8 files changed, 0 insertions, 66 deletions
diff --git a/src/library/scala/collection/parallel/immutable/ParHashMap.scala b/src/library/scala/collection/parallel/immutable/ParHashMap.scala index 52d6531f9e..49b00bebdb 100644 --- a/src/library/scala/collection/parallel/immutable/ParHashMap.scala +++ b/src/library/scala/collection/parallel/immutable/ParHashMap.scala @@ -117,18 +117,6 @@ self => override def toString = "HashTrieIterator(" + sz + ")" } - /* serialization */ - - private def writeObject(out: java.io.ObjectOutputStream) { - out.defaultWriteObject - } - - private def readObject(in: java.io.ObjectInputStream) { - in.defaultReadObject - - initTaskSupport() - } - /* debug */ private[parallel] def printDebugInfo() { diff --git a/src/library/scala/collection/parallel/immutable/ParHashSet.scala b/src/library/scala/collection/parallel/immutable/ParHashSet.scala index 0a19afc426..11d92a27c9 100644 --- a/src/library/scala/collection/parallel/immutable/ParHashSet.scala +++ b/src/library/scala/collection/parallel/immutable/ParHashSet.scala @@ -112,18 +112,6 @@ self => def remaining = sz - i } - /* serialization */ - - private def writeObject(out: java.io.ObjectOutputStream) { - out.defaultWriteObject - } - - private def readObject(in: java.io.ObjectInputStream) { - in.defaultReadObject - - initTaskSupport() - } - } diff --git a/src/library/scala/collection/parallel/immutable/ParRange.scala b/src/library/scala/collection/parallel/immutable/ParRange.scala index 364175fe41..9cac433460 100644 --- a/src/library/scala/collection/parallel/immutable/ParRange.scala +++ b/src/library/scala/collection/parallel/immutable/ParRange.scala @@ -106,18 +106,6 @@ self => } } - /* serialization */ - - private def writeObject(out: java.io.ObjectOutputStream) { - out.defaultWriteObject - } - - private def readObject(in: java.io.ObjectInputStream) { - in.defaultReadObject - - initTaskSupport() - } - } object ParRange { diff --git a/src/library/scala/collection/parallel/immutable/ParVector.scala b/src/library/scala/collection/parallel/immutable/ParVector.scala index 310b09a016..5d9c431bc1 100644 --- a/src/library/scala/collection/parallel/immutable/ParVector.scala +++ b/src/library/scala/collection/parallel/immutable/ParVector.scala @@ -78,18 +78,6 @@ extends ParSeq[T] splitted.map(v => new ParVector(v).splitter.asInstanceOf[ParVectorIterator]) } } - - /* serialization */ - - private def writeObject(out: java.io.ObjectOutputStream) { - out.defaultWriteObject - } - - private def readObject(in: java.io.ObjectInputStream) { - in.defaultReadObject - - initTaskSupport() - } } diff --git a/src/library/scala/collection/parallel/mutable/ParArray.scala b/src/library/scala/collection/parallel/mutable/ParArray.scala index 683b7eaa9a..c33495bd39 100644 --- a/src/library/scala/collection/parallel/mutable/ParArray.scala +++ b/src/library/scala/collection/parallel/mutable/ParArray.scala @@ -675,8 +675,6 @@ self => // get raw array from arrayseq array = arrayseq.array.asInstanceOf[Array[Any]] - - initTaskSupport() } } diff --git a/src/library/scala/collection/parallel/mutable/ParCtrie.scala b/src/library/scala/collection/parallel/mutable/ParCtrie.scala index b4dc8beb2a..470972adad 100644 --- a/src/library/scala/collection/parallel/mutable/ParCtrie.scala +++ b/src/library/scala/collection/parallel/mutable/ParCtrie.scala @@ -115,18 +115,6 @@ extends ParMap[K, V] override def merge(that: Size) = result = result + that.result } - /* serialization */ - - private def writeObject(out: java.io.ObjectOutputStream) { - out.defaultWriteObject - } - - private def readObject(in: java.io.ObjectInputStream) { - in.defaultReadObject - - initTaskSupport() - } - } diff --git a/src/library/scala/collection/parallel/mutable/ParHashMap.scala b/src/library/scala/collection/parallel/mutable/ParHashMap.scala index 72526aadb1..6ce6c45460 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashMap.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashMap.scala @@ -106,8 +106,6 @@ self => private def readObject(in: java.io.ObjectInputStream) { init[V](in, new Entry(_, _)) - - initTaskSupport() } private[parallel] override def brokenInvariants = { diff --git a/src/library/scala/collection/parallel/mutable/ParHashSet.scala b/src/library/scala/collection/parallel/mutable/ParHashSet.scala index 84b7c4e42c..e0a2ab03df 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashSet.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashSet.scala @@ -84,8 +84,6 @@ extends ParSet[T] private def readObject(in: java.io.ObjectInputStream) { init(in, x => x) - - initTaskSupport() } import collection.DebugUtils._ |