summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2016-03-11 09:51:57 -0500
committerRamon Fernandez <ramon@mongodb.com>2016-03-29 18:12:45 -0400
commitd62c6451399b1655eb31fc9554ac14928f7bb7cd (patch)
tree31487d0cc71b6c7712196f04cb905757f05a54ae
parent333fad00034cd35dd0b1ffabefd3b6ee9ed5f849 (diff)
downloadmongo-d62c6451399b1655eb31fc9554ac14928f7bb7cd.tar.gz
SERVER-21681 Replace 'or' with operator || to fix Windows build
(cherry picked from commit 73409b9364b8d83442a23a57ad910fc0438511ec)
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
index c71d121b288..1708a02a44f 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
@@ -415,7 +415,7 @@ long long WiredTigerIndex::getSpaceUsedBytes(OperationContext* txn) const {
auto removes = getStats(WT_STAT_DSRC_CURSOR_REMOVE);
auto insertBytes = getStats(WT_STAT_DSRC_CURSOR_INSERT_BYTES);
- if (inserts == 0 or removes >= inserts)
+ if (inserts == 0 || removes >= inserts)
return 0;
// Rough approximation of index size as average entry size times number of entries.