Commit f9e4e7c2 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

get the range_tree tests to compile on centos 5.2 with gcc 4.1.2

git-svn-id: file:///svn/toku/tokudb.1032b@8273 c7de825b-a66e-492c-adef-691d508d4ae1
parent 75369283
...@@ -55,6 +55,10 @@ TXNID_cmp (const TXNID a, const TXNID b) { ...@@ -55,6 +55,10 @@ TXNID_cmp (const TXNID a, const TXNID b) {
return a < b ? -1 : (a != b); /* \marginpar{!?} */ return a < b ? -1 : (a != b); /* \marginpar{!?} */
} }
struct __toku_point {
int n;
};
static inline int static inline int
int_cmp (const toku_point* a, const toku_point*b) { int_cmp (const toku_point* a, const toku_point*b) {
int x = *(int*)a; int x = *(int*)a;
......
...@@ -65,7 +65,7 @@ int main(int argc, const char *argv[]) { ...@@ -65,7 +65,7 @@ int main(int argc, const char *argv[]) {
unsigned bufsize = 2; unsigned bufsize = 2;
unsigned found; unsigned found;
int stuff[3] = {0,1,2}; toku_point stuff[3] = {{0},{1},{2}};
range.ends.left = (toku_point*)&stuff[0]; range.ends.left = (toku_point*)&stuff[0];
range.ends.right = (toku_point*)&stuff[1]; range.ends.right = (toku_point*)&stuff[1];
range.data = 0; range.data = 0;
......
...@@ -6,7 +6,7 @@ int main(int argc, const char *argv[]) { ...@@ -6,7 +6,7 @@ int main(int argc, const char *argv[]) {
int r; int r;
toku_range_tree *tree; toku_range_tree *tree;
toku_range range; toku_range range;
int nums[8] = {0,1,2,3,4,5,6,7}; toku_point nums[8] = {{0},{1},{2},{3},{4},{5},{6},{7}};
char letters[2] = {'A','B'}; char letters[2] = {'A','B'};
......
...@@ -8,7 +8,7 @@ int main(int argc, const char *argv[]) { ...@@ -8,7 +8,7 @@ int main(int argc, const char *argv[]) {
toku_range range; toku_range range;
toku_interval find_range; toku_interval find_range;
toku_interval find_all_range; toku_interval find_all_range;
int nums[1000]; toku_point nums[1000];
char letters[2] = {'A','B'}; char letters[2] = {'A','B'};
unsigned found; unsigned found;
unsigned bufsize; unsigned bufsize;
...@@ -19,7 +19,7 @@ int main(int argc, const char *argv[]) { ...@@ -19,7 +19,7 @@ int main(int argc, const char *argv[]) {
parse_args(argc, argv); parse_args(argc, argv);
for (j = 0; j < sizeof(nums)/sizeof(nums[0]); j++) { for (j = 0; j < sizeof(nums)/sizeof(nums[0]); j++) {
nums[j] = j; nums[j].n = j;
} }
find_range.left = (toku_point*)&nums[4]; find_range.left = (toku_point*)&nums[4];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment