Merge remote-tracking branch 'origin/master'

denisrosset · Apr 20, 2016 · f6c64f9 · f6c64f9
2 parents 2052e9b + 497fc91
commit f6c64f9
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/library/src/main/scala/metal/mutable/BitSet.scala b/library/src/main/scala/metal/mutable/BitSet.scala
@@ -125,4 +125,13 @@ object BitSet extends mutable.SetBuilder[Int, mutable.BitSet] {
     new mutable.FixedBitSet(new Array[Long](nWordsForSize(n.toInt)))
   }
 
+  override def fromIterable(items: Iterable[Int]): mutable.BitSet = items match {
+    case bs1: scala.collection.immutable.BitSet.BitSet1 => new mutable.ResizableBitSet(Array(bs1.elems), 1)
+    case bsn: scala.collection.immutable.BitSet.BitSetN => new mutable.ResizableBitSet(bsn.elems, bsn.elems.length)
+    case bs: scala.collection.BitSet =>
+      val bm = bs.toBitMask
+      new mutable.ResizableBitSet(bm, bm.length)
+    case _ => super.fromIterable(items)
+  }
+
 }