diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-02-18 15:08:12 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-02-18 15:08:12 +1100 |
| commit | ba5657d999a169bc7a61541b5f18690a3bed2dfc (patch) | |
| tree | 5eb6a79f752610c39c819ffb49185eb9618d4e98 | |
| parent | 5d739aaf9cbd578411732314042f8070b9432084 (diff) | |
| parent | b82ac0b95e1af1c077c34448b08fbe24e493951d (diff) | |
| download | mongo-ba5657d999a169bc7a61541b5f18690a3bed2dfc.tar.gz | |
Merge pull request #2500 from wiredtiger/wt-2399-gcc41
WT-2399 clean up GCC 4.1 build warning.
| -rw-r--r-- | test/cursor_order/cursor_order.c | 10 | ||||
| -rw-r--r-- | test/cursor_order/cursor_order_ops.c | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/test/cursor_order/cursor_order.c b/test/cursor_order/cursor_order.c index 0155339d71e..14709a2e88e 100644 --- a/test/cursor_order/cursor_order.c +++ b/test/cursor_order/cursor_order.c @@ -88,7 +88,7 @@ main(int argc, char *argv[]) working_dir = __wt_optarg; break; case 'k': /* rows */ - cfg->nkeys = (u_int64_t)atol(__wt_optarg); + cfg->nkeys = (uint64_t)atol(__wt_optarg); break; case 'l': /* log */ if ((logfp = fopen(__wt_optarg, "w")) == NULL) { @@ -98,10 +98,10 @@ main(int argc, char *argv[]) } break; case 'n': /* operations */ - cfg->max_nops = (u_int64_t)atol(__wt_optarg); + cfg->max_nops = (uint64_t)atol(__wt_optarg); break; case 'R': - cfg->reverse_scanners = (u_int64_t)atol(__wt_optarg); + cfg->reverse_scanners = (uint64_t)atol(__wt_optarg); break; case 'r': /* runs */ runs = atoi(__wt_optarg); @@ -125,10 +125,10 @@ main(int argc, char *argv[]) cfg->vary_nops = true; break; case 'w': - cfg->reverse_scan_ops = (u_int64_t)atol(__wt_optarg); + cfg->reverse_scan_ops = (uint64_t)atol(__wt_optarg); break; case 'W': - cfg->append_inserters = (u_int64_t)atol(__wt_optarg); + cfg->append_inserters = (uint64_t)atol(__wt_optarg); break; default: return (usage()); diff --git a/test/cursor_order/cursor_order_ops.c b/test/cursor_order/cursor_order_ops.c index e2578f7544e..9077f500594 100644 --- a/test/cursor_order/cursor_order_ops.c +++ b/test/cursor_order/cursor_order_ops.c @@ -180,6 +180,9 @@ reverse_scan_op( WT_UNUSED(session); WT_UNUSED(s); + /* Make GCC 4.1 happy */ + prev_key = this_key = 0; + /* Reset the cursor */ cursor->reset(cursor); @@ -269,7 +272,7 @@ append_insert_op( SHARED_CONFIG *cfg, WT_SESSION *session, WT_CURSOR *cursor, INFO *s) { WT_ITEM *value, _value; - int64_t keyno; + uint64_t keyno; int ret; char keybuf[64], valuebuf[64]; |