diff options
| author | Dave Borowitz <dborowitz@google.com> | 2016-07-20 10:16:26 -0400 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-11-17 00:26:44 +0100 |
| commit | 5bb434e01fd38bd31bdf1beaa8f608ad395b44dd (patch) | |
| tree | 8b9bbe1afc26e499afd3aaf9058a541fdb453cc6 /org.eclipse.jgit | |
| parent | 52fa09c8d4c21e000df4c0f7291a182a2afb4157 (diff) | |
| download | jgit-5bb434e01fd38bd31bdf1beaa8f608ad395b44dd.tar.gz jgit-5bb434e01fd38bd31bdf1beaa8f608ad395b44dd.zip | |
Update JavaEWAH to 1.1.6
Use Oxygen M3 Orbit repository which provides the bundles built using
the new orbit-recipe based build.
CQ: 11658
Change-Id: I7f3dcc966732b32830c75d5daa55383bd028d182
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 673f082a08..03a90f9b04 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -138,7 +138,7 @@ Export-Package: org.eclipse.jgit.annotations;version="4.6.0", org.ietf.jgss", org.eclipse.jgit.util.io;version="4.6.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", +Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.37,0.2.0)", javax.crypto, javax.net.ssl, 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 f146a540a2..f397ef143d 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 @@ -504,8 +504,8 @@ public class BitmapIndexImpl implements BitmapIndex { static final EWAHCompressedBitmap ones(int sizeInBits) { EWAHCompressedBitmap mask = new EWAHCompressedBitmap(); mask.addStreamOfEmptyWords( - true, sizeInBits / EWAHCompressedBitmap.wordinbits); - int remaining = sizeInBits % EWAHCompressedBitmap.wordinbits; + true, sizeInBits / EWAHCompressedBitmap.WORD_IN_BITS); + int remaining = sizeInBits % EWAHCompressedBitmap.WORD_IN_BITS; if (remaining > 0) mask.add((1L << remaining) - 1, remaining); return mask; |