diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-11-18 13:36:05 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-11-18 13:36:05 +1100 |
| commit | a6c11bf6b5dabeda24dcc427d81154b619e811f1 (patch) | |
| tree | 4d906244d8d791c8b78e1b0888c22cd4beb141bd /src | |
| parent | 773396d9413dbd0671dbac0b4f42d0fd125d3f90 (diff) | |
| download | mongo-a6c11bf6b5dabeda24dcc427d81154b619e811f1.tar.gz | |
Fix another warning:
../src/session/session_api.c:654:12: error: declaration of 'index' shadows a global declaration [-Werror=shadow]
(Note: these were not picked up earlier because Jenkins scheduled
builds on a server with a different version of GCC).
Diffstat (limited to 'src')
| -rw-r--r-- | src/session/session_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/session/session_api.c b/src/session/session_api.c index 25de2f2983a..67e26618cf6 100644 --- a/src/session/session_api.c +++ b/src/session/session_api.c @@ -651,7 +651,7 @@ __session_join(WT_SESSION *wt_session, WT_CURSOR *join_cursor, WT_CURSOR_INDEX *cindex; WT_CURSOR_JOIN *cjoin; WT_CURSOR_TABLE *ctable; - WT_INDEX *index; + WT_INDEX *idx; WT_TABLE *table; uint32_t flags, range; uint64_t count; @@ -669,11 +669,11 @@ __session_join(WT_SESSION *wt_session, WT_CURSOR *join_cursor, if (WT_PREFIX_MATCH(ref_cursor->uri, "index:")) { cindex = (WT_CURSOR_INDEX *)ref_cursor; - index = cindex->index; + idx = cindex->index; table = cindex->table; WT_CURSOR_CHECKKEY(ref_cursor); } else if (WT_PREFIX_MATCH(ref_cursor->uri, "table:")) { - index = NULL; + idx = NULL; ctable = (WT_CURSOR_TABLE *)ref_cursor; table = ctable->table; WT_CURSOR_CHECKKEY(ctable->cg_cursors[0]); @@ -736,7 +736,7 @@ __session_join(WT_SESSION *wt_session, WT_CURSOR *join_cursor, WT_ERR(EINVAL); } } - WT_ERR(__wt_curjoin_join(session, cjoin, index, ref_cursor, flags, + WT_ERR(__wt_curjoin_join(session, cjoin, idx, ref_cursor, flags, range, count, bloom_bit_count, bloom_hash_count)); /* * There's an implied ownership ordering that isn't |