diff options
author | Mathias Stearn <mathias@10gen.com> | 2013-08-19 19:20:22 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2013-08-19 19:26:17 -0400 |
commit | 0f99864fcf8f82ff2c7cb685281bc9e5d6bc6616 (patch) | |
tree | 837bf7ed96153b771edd85cff23d9a4666e660fd | |
parent | 09d28e81e81506b30e1365175d4fd9af48a04357 (diff) | |
download | mongo-0f99864fcf8f82ff2c7cb685281bc9e5d6bc6616.tar.gz |
Fix signed/unsigned comparisons
-rw-r--r-- | src/mongo/db/pipeline/document_source_out.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/sorter/sorter.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/pipeline/document_source_out.cpp b/src/mongo/db/pipeline/document_source_out.cpp index fb6c9fbd871..f76a6d74a3a 100644 --- a/src/mongo/db/pipeline/document_source_out.cpp +++ b/src/mongo/db/pipeline/document_source_out.cpp @@ -101,7 +101,7 @@ namespace mongo { verify(_tempNs.size() != 0); vector<BSONObj> bufferedObjects; - size_t bufferedBytes = 0; + int bufferedBytes = 0; while (boost::optional<Document> next = pSource->getNext()) { BSONObj toInsert = next->toBson(); bufferedBytes += toInsert.objsize(); diff --git a/src/mongo/db/sorter/sorter.cpp b/src/mongo/db/sorter/sorter.cpp index a4e77cab354..532b8ef9d64 100644 --- a/src/mongo/db/sorter/sorter.cpp +++ b/src/mongo/db/sorter/sorter.cpp @@ -729,9 +729,9 @@ namespace mongo { bool _haveCutoff; Data _cutoff; // We can definitely ignore values worse than this. Data _worstSeen; // The worst Data seen so far. Reset when _worstCount >= _opts.limit. - int _worstCount; // Number of docs better or equal to _worstSeen kept so far. + size_t _worstCount; // Number of docs better or equal to _worstSeen kept so far. Data _lastMedian; // Median of a batch. Reset when _medianCount >= _opts.limit. - int _medianCount; // Number of docs better or equal to _lastMedian kept so far. + size_t _medianCount; // Number of docs better or equal to _lastMedian kept so far. }; inline unsigned nextFileNumber() { @@ -790,10 +790,10 @@ namespace mongo { std::string compressed; snappy::Compress(_buffer.buf(), _buffer.len(), &compressed); - verify(compressed.size() <= std::numeric_limits<int32_t>::max()); + verify(compressed.size() <= size_t(std::numeric_limits<int32_t>::max())); try { - if (compressed.size() < _buffer.len()/9*10) { + if (compressed.size() < size_t(_buffer.len()/9*10)) { const int32_t size = -compressed.size(); // negative means compressed _file.write(reinterpret_cast<const char*>(&size), sizeof(size)); _file.write(compressed.data(), compressed.size()); |