From 654ae829708f944314e681486d23aedcd2344b21 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 8 Dec 2016 11:10:35 +0900 Subject: [PATCH] Replace usage of deprecated EWAHCompressedBitmap.add(long) The add(long) method was deprecated in favor of addWord(long) in the 0.8.3 release of JavaEWAH [1]. [1] https://github.com/lemire/javaewah/commit/e443cf5e Change-Id: I89c397ed02e040f57663d04504399dfdc0889626 Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/internal/storage/file/BitSet.java | 4 ++-- .../eclipse/jgit/internal/storage/file/BitmapIndexImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java index ddb5ff0ca..bafae87cd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitSet.java @@ -96,7 +96,7 @@ final EWAHCompressedBitmap toEWAHCompressedBitmap() { } if (lastNonEmptyWord != 0) - compressed.add(lastNonEmptyWord); + compressed.addWord(lastNonEmptyWord); if (runningEmptyWords > 0) { compressed.addStreamOfEmptyWords(false, runningEmptyWords); @@ -107,7 +107,7 @@ final EWAHCompressedBitmap toEWAHCompressedBitmap() { } int bitsThatMatter = 64 - Long.numberOfLeadingZeros(lastNonEmptyWord); if (bitsThatMatter > 0) - compressed.add(lastNonEmptyWord, bitsThatMatter); + compressed.addWord(lastNonEmptyWord, bitsThatMatter); return compressed; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java index f397ef143..b18a06f9c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java @@ -507,7 +507,7 @@ static final EWAHCompressedBitmap ones(int sizeInBits) { true, sizeInBits / EWAHCompressedBitmap.WORD_IN_BITS); int remaining = sizeInBits % EWAHCompressedBitmap.WORD_IN_BITS; if (remaining > 0) - mask.add((1L << remaining) - 1, remaining); + mask.addWord((1L << remaining) - 1, remaining); return mask; } }