summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-09-25 16:36:44 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-09-25 16:38:59 -0400
commitbcea622441dc2f689c4651981f9d7929a1dd75b3 (patch)
tree140ab8bc473f902efdb382a11ab5ced520d55404
parent68881762f612542372f8f55d61db0bf7856da762 (diff)
downloadmongo-bcea622441dc2f689c4651981f9d7929a1dd75b3.tar.gz
SERVER-14668 Fix compile break on 32-bit and Clang
Introduced by commit e671a2c31f6b555254e4ad8265f66578f8c805aa
-rw-r--r--src/mongo/db/catalog/collection.cpp2
-rw-r--r--src/mongo/db/catalog/collection.h2
-rw-r--r--src/mongo/db/catalog/database.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/catalog/collection.cpp b/src/mongo/db/catalog/collection.cpp
index 8bafe73e7cd..740914239bd 100644
--- a/src/mongo/db/catalog/collection.cpp
+++ b/src/mongo/db/catalog/collection.cpp
@@ -441,7 +441,7 @@ namespace mongo {
return _recordStore->dataSize( txn );
}
- uint64_t Collection::getIndexSize(OperationContext* opCtx,
+ size_t Collection::getIndexSize(OperationContext* opCtx,
BSONObjBuilder* details,
int scale) {
diff --git a/src/mongo/db/catalog/collection.h b/src/mongo/db/catalog/collection.h
index 3cb0b7d4816..348ca42c129 100644
--- a/src/mongo/db/catalog/collection.h
+++ b/src/mongo/db/catalog/collection.h
@@ -257,7 +257,7 @@ namespace mongo {
return static_cast<int>( dataSize( txn ) / n );
}
- uint64_t getIndexSize(OperationContext* opCtx,
+ size_t getIndexSize(OperationContext* opCtx,
BSONObjBuilder* details = NULL,
int scale = 1);
diff --git a/src/mongo/db/catalog/database.cpp b/src/mongo/db/catalog/database.cpp
index 6f084aec8d0..f2fefa3bd8b 100644
--- a/src/mongo/db/catalog/database.cpp
+++ b/src/mongo/db/catalog/database.cpp
@@ -250,7 +250,7 @@ namespace mongo {
long long storageSize = 0;
long long numExtents = 0;
long long indexes = 0;
- long long indexSize = 0;
+ size_t indexSize = 0;
for (list<string>::const_iterator it = collections.begin(); it != collections.end(); ++it) {
const string ns = *it;