diff options
| -rw-r--r-- | src/mongo/db/ftdc/compressor.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/ftdc/compressor_test.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/ftdc/file_writer.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/pipeline/document_source_group.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/util/concurrency/shared_mutex_win.hpp | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/mongo/db/ftdc/compressor.cpp b/src/mongo/db/ftdc/compressor.cpp index 1c4bfcac7e3..ecf9c7ece6c 100644 --- a/src/mongo/db/ftdc/compressor.cpp +++ b/src/mongo/db/ftdc/compressor.cpp @@ -47,7 +47,7 @@ FTDCCompressor::addSample(const BSONObj& sample, Date_t date) { if (_referenceDoc.isEmpty()) { FTDCBSONUtil::extractMetricsFromDocument(sample, sample, &_metrics); _reset(sample, date); - return {boost::none_t()}; + return {boost::none}; } _metrics.resize(0); @@ -107,7 +107,7 @@ FTDCCompressor::addSample(const BSONObj& sample, Date_t date) { } // The buffer is not full, inform the caller - return {boost::none_t()}; + return {boost::none}; } StatusWith<std::tuple<ConstDataRange, Date_t>> FTDCCompressor::getCompressedSamples() { diff --git a/src/mongo/db/ftdc/compressor_test.cpp b/src/mongo/db/ftdc/compressor_test.cpp index 518e5e84412..6950dd93f66 100644 --- a/src/mongo/db/ftdc/compressor_test.cpp +++ b/src/mongo/db/ftdc/compressor_test.cpp @@ -122,7 +122,7 @@ public: TestTie() : _compressor(&_config) {} ~TestTie() { - validate(boost::none_t()); + validate(boost::none); } StatusWith<boost::optional<std::tuple<ConstDataRange, FTDCCompressor::CompressorState, Date_t>>> diff --git a/src/mongo/db/ftdc/file_writer.cpp b/src/mongo/db/ftdc/file_writer.cpp index 576f946700a..7ab7ee7934c 100644 --- a/src/mongo/db/ftdc/file_writer.cpp +++ b/src/mongo/db/ftdc/file_writer.cpp @@ -205,7 +205,7 @@ Status FTDCFileWriter::flush(const boost::optional<ConstDataRange>& range, Date_ Status FTDCFileWriter::close() { if (_archiveStream.is_open()) { - Status s = flush(boost::none_t(), Date_t()); + Status s = flush(boost::none, Date_t()); _archiveStream.close(); diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp index 1d33a337024..57209147a0e 100644 --- a/src/mongo/db/pipeline/document_source_group.cpp +++ b/src/mongo/db/pipeline/document_source_group.cpp @@ -133,7 +133,7 @@ boost::optional<Document> DocumentSourceGroup::getNextStreaming() { // Release our references to the previous input document before asking for the next. This // makes operations like $unwind more efficient. _variables->clearRoot(); - _firstDocOfNextGroup = {}; + _firstDocOfNextGroup = boost::none; // Retrieve the next document. _firstDocOfNextGroup = pSource->getNext(); diff --git a/src/mongo/util/concurrency/shared_mutex_win.hpp b/src/mongo/util/concurrency/shared_mutex_win.hpp index a51afafb52d..86ad659a6d8 100644 --- a/src/mongo/util/concurrency/shared_mutex_win.hpp +++ b/src/mongo/util/concurrency/shared_mutex_win.hpp @@ -175,7 +175,7 @@ namespace boost return true;
}
- unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
+ unsigned long const res=WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
if(res==detail::win32::timeout)
{
for(;;)
@@ -328,7 +328,7 @@ namespace boost {
return true;
}
- unsigned long const wait_res=detail::win32::WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
+ unsigned long const wait_res=WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
if(wait_res==detail::win32::timeout)
{
for(;;)
@@ -421,7 +421,7 @@ namespace boost return;
}
- BOOST_VERIFY(!detail::win32::WaitForSingleObject(unlock_sem,detail::win32::infinite));
+ BOOST_VERIFY(!WaitForSingleObject(unlock_sem,detail::win32::infinite));
}
}
@@ -502,7 +502,7 @@ namespace boost {
if(!last_reader)
{
- BOOST_VERIFY(!detail::win32::WaitForSingleObject(upgrade_sem,detail::win32::infinite));
+ BOOST_VERIFY(!WaitForSingleObject(upgrade_sem,detail::win32::infinite));
}
break;
}
|