From 34c3497e20c3f44aae85825d7d107e5ba5ec8bcb Mon Sep 17 00:00:00 2001
From: Travis Turner <travis@pilosa.com>
Date: Wed, 7 Feb 2018 14:00:13 -0600
Subject: [PATCH] rebase and fix tests

---
 roaring/roaring_internal_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roaring/roaring_internal_test.go b/roaring/roaring_internal_test.go
index 7a80e0ec5..27636838e 100644
--- a/roaring/roaring_internal_test.go
+++ b/roaring/roaring_internal_test.go
@@ -2254,7 +2254,7 @@ func TestIteratorVarious(t *testing.T) {
 		exp uint64
 	}{
 		{
-			bm:  NewBitmap(3, 4, 5),
+			bm:  NewSliceBitmap(3, 4, 5),
 			exp: 3,
 		},
 		{
@@ -2262,7 +2262,7 @@ func TestIteratorVarious(t *testing.T) {
 			exp: 61221,
 		},
 		{
-			bm:  NewBitmap(2, 66000, 70000, 70001, 70002, 70003, 70004),
+			bm:  NewSliceBitmap(2, 66000, 70000, 70001, 70002, 70003, 70004),
 			exp: 7,
 		},
 	}
@@ -2669,7 +2669,7 @@ func bitmapVariousContainers() *Bitmap {
 	bits = append(bits, bitCont(7, true, true, true)...)
 	bits = append(bits, arrCont(8, true, true, true)...)
 	bits = append(bits, rleCont(9, true, true, true)...)
-	bm := NewBitmap(bits...)
+	bm := NewSliceBitmap(bits...)
 	bm.Optimize()
 	return bm
 }