Commit 0a18f458 authored by Rich Prohaska's avatar Rich Prohaska

set -O2. fix 64bit build

git-svn-id: file:///svn/tokudb@2107 c7de825b-a66e-492c-adef-691d508d4ae1
parent c42703fd
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# GCOV_FLAGS = -fprofile-arcs -ftest-coverage # GCOV_FLAGS = -fprofile-arcs -ftest-coverage
# PROF_FLAGS = -pg # PROF_FLAGS = -pg
# OPTFLAGS = -O2 OPTFLAGS = -O2
ifeq ($(VERBOSE),2) ifeq ($(VERBOSE),2)
VERBVERBOSE=-v VERBVERBOSE=-v
......
...@@ -678,7 +678,7 @@ static int handle_split_of_child (BRT t, BRTNODE node, int childnum, ...@@ -678,7 +678,7 @@ static int handle_split_of_child (BRT t, BRTNODE node, int childnum,
goto ok; goto ok;
case BRT_NONE: case BRT_NONE:
// Don't have to do anything in this case, can just drop the command // Don't have to do anything in this case, can just drop the command
goto ok; break;
} }
printf("Bad type %d\n", type); // Don't use default: because I want a compiler warning if I forget a enum case, and I want a runtime error if the type isn't one of the expected ones. printf("Bad type %d\n", type); // Don't use default: because I want a compiler warning if I forget a enum case, and I want a runtime error if the type isn't one of the expected ones.
assert(0); assert(0);
...@@ -1745,7 +1745,7 @@ int toku_dump_brtnode (BRT brt, DISKOFF off, int depth, bytevec lorange, ITEMLEN ...@@ -1745,7 +1745,7 @@ int toku_dump_brtnode (BRT brt, DISKOFF off, int depth, bytevec lorange, ITEMLEN
FIFO_ITERATE(BNC_BUFFER(node,i), key, keylen, data, datalen, type, xid, FIFO_ITERATE(BNC_BUFFER(node,i), key, keylen, data, datalen, type, xid,
({ ({
data=data; datalen=datalen; keylen=keylen; data=data; datalen=datalen; keylen=keylen;
printf("%*s xid=%lld %d (type=%d)\n", depth+2, "", xid, ntohl(*(int*)key), type); printf("%*s xid=%"PRId64" %d (type=%d)\n", depth+2, "", xid, ntohl(*(int*)key), type);
//assert(strlen((char*)key)+1==keylen); //assert(strlen((char*)key)+1==keylen);
//assert(strlen((char*)data)+1==datalen); //assert(strlen((char*)data)+1==datalen);
})); }));
......
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