summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSusan LoVerso <sue@wiredtiger.com>2015-04-01 16:19:35 -0400
committerSusan LoVerso <sue@wiredtiger.com>2015-04-01 16:19:35 -0400
commit6ff72fb2a919d4d68077c8afba8881be798a89a4 (patch)
tree4018aa029eb926654599a076555824c0d68fbb34
parent078cb46916b55c254abe1a966a2413410a5f6174 (diff)
downloadmongo-6ff72fb2a919d4d68077c8afba8881be798a89a4.tar.gz
Fix warnings.
-rw-r--r--dist/s_string.ok1
-rw-r--r--src/include/btree_cmp.i10
2 files changed, 9 insertions, 2 deletions
diff --git a/dist/s_string.ok b/dist/s_string.ok
index e056c2045bc..5543fe0470d 100644
--- a/dist/s_string.ok
+++ b/dist/s_string.ok
@@ -879,6 +879,7 @@ valuep
valuev
vanishingly
variable's
+vectorized
versa
vfprintf
vpack
diff --git a/src/include/btree_cmp.i b/src/include/btree_cmp.i
index 89d84e13556..3ff16f7f7ac 100644
--- a/src/include/btree_cmp.i
+++ b/src/include/btree_cmp.i
@@ -28,7 +28,10 @@
static inline int
__wt_lex_compare(const WT_ITEM *user_item, const WT_ITEM *tree_item)
{
- size_t len, remain, usz, tsz;
+ size_t len, usz, tsz;
+#ifdef HAVE_X86INTRIN_H
+ size_t remain;
+#endif
const uint8_t *userp, *treep;
usz = user_item->size;
@@ -113,7 +116,10 @@ static inline int
__wt_lex_compare_skip(
const WT_ITEM *user_item, const WT_ITEM *tree_item, size_t *matchp)
{
- size_t len, remain, usz, tsz;
+ size_t len, usz, tsz;
+#ifdef HAVE_X86INTRIN_H
+ size_t remain;
+#endif
const uint8_t *userp, *treep;
usz = user_item->size;