Fix DBImpl::GetWalPreallocateBlockSize Mac build error

Summary: Specify type param with std::min to resolve compile error on Mac.

Test Plan: https://travis-ci.org/facebook/rocksdb/builds/161223845

Reviewers: sdong

Reviewed By: sdong

Subscribers: andrewkr, dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D64143
main
Yi Wu 8 years ago
parent 7afbb7420b
commit e4d3f5d9b8
  1. 7
      db/db_impl.cc

@ -3687,14 +3687,15 @@ size_t DBImpl::GetWalPreallocateBlockSize(uint64_t write_buffer_size) const {
// Some users might set very high write_buffer_size and rely on // Some users might set very high write_buffer_size and rely on
// max_total_wal_size or other parameters to control the WAL size. // max_total_wal_size or other parameters to control the WAL size.
if (db_options_.max_total_wal_size > 0) { if (db_options_.max_total_wal_size > 0) {
bsize = std::min(bsize, db_options_.max_total_wal_size); bsize = std::min<size_t>(bsize, db_options_.max_total_wal_size);
} }
if (db_options_.db_write_buffer_size > 0) { if (db_options_.db_write_buffer_size > 0) {
bsize = std::min(bsize, db_options_.db_write_buffer_size); bsize = std::min<size_t>(bsize, db_options_.db_write_buffer_size);
} }
if (db_options_.write_buffer_manager && if (db_options_.write_buffer_manager &&
db_options_.write_buffer_manager->enabled()) { db_options_.write_buffer_manager->enabled()) {
bsize = std::min(bsize, db_options_.write_buffer_manager->buffer_size()); bsize = std::min<size_t>(bsize,
db_options_.write_buffer_manager->buffer_size());
} }
return bsize; return bsize;

Loading…
Cancel
Save