projects
/
SXSI
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forces 64 bit integers (using stdint.h and uint64_t) for bit field
[SXSI/libcds.git]
/
src
/
static_bitsequence
/
sdarray.cpp
diff --git
a/src/static_bitsequence/sdarray.cpp
b/src/static_bitsequence/sdarray.cpp
index
43dea90
..
30cdf9e
100644
(file)
--- a/
src/static_bitsequence/sdarray.cpp
+++ b/
src/static_bitsequence/sdarray.cpp
@@
-1,4
+1,5
@@
#include <sdarray.h>
#include <sdarray.h>
+#include <stdint.h>
using std::min;
using std::max;
#if 0
using std::min;
using std::max;
#if 0
@@
-131,10
+132,10
@@
uint __getbits_aux(uint *B, int i, int d) {
static uint __getbits(uint *B, int i, int d)
{
static uint __getbits(uint *B, int i, int d)
{
- u
long
x;
+ u
int64_t
x;
B += (i >> logD);
i &= (D-1);
B += (i >> logD);
i &= (D-1);
- x = ((u
long
*) B)[0];
+ x = ((u
int64_t
*) B)[0];
x = (x << 32)|(x >> 32);
x = (x << i) >> (2*D - d);
return x;
x = (x << 32)|(x >> 32);
x = (x << i) >> (2*D - d);
return x;