diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch')
-rw-r--r-- | dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch b/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch deleted file mode 100644 index 41c9bd2ba85c..000000000000 --- a/dev-db/mongodb/files/mongodb-3.2.4-boost-1.60.patch +++ /dev/null @@ -1,84 +0,0 @@ -Fix issues caused by boost::none changes.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=578846
-Adapted from: https://github.com/mongodb/mongo/commit/92c3f80f384d2825efeabd0d26aa534c0deb6988
-
---- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp -+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp -@@ -47,7 +47,7 @@ - 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 @@ - } - - // The buffer is not full, inform the caller -- return {boost::none_t()}; -+ return {boost::none}; - } - - StatusWith<std::tuple<ConstDataRange, Date_t>> FTDCCompressor::getCompressedSamples() { ---- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp -+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp -@@ -122,7 +122,7 @@ - TestTie() : _compressor(&_config) {} - - ~TestTie() { -- validate(boost::none_t()); -+ validate(boost::none); - } - - StatusWith<boost::optional<std::tuple<ConstDataRange, FTDCCompressor::CompressorState, Date_t>>> ---- mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp -+++ mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp -@@ -205,7 +205,7 @@ - - Status FTDCFileWriter::close() { - if (_archiveStream.is_open()) { -- Status s = flush(boost::none_t(), Date_t()); -+ Status s = flush(boost::none, Date_t()); - - _archiveStream.close(); - ---- mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp -+++ mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp -@@ -175,7 +175,7 @@ - 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 @@ - {
- 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 @@ - return;
- }
-
-- BOOST_VERIFY(!detail::win32::WaitForSingleObject(unlock_sem,detail::win32::infinite));
-+ BOOST_VERIFY(!WaitForSingleObject(unlock_sem,detail::win32::infinite));
- }
- }
-
-@@ -502,7 +502,7 @@ - {
- if(!last_reader)
- {
-- BOOST_VERIFY(!detail::win32::WaitForSingleObject(upgrade_sem,detail::win32::infinite));
-+ BOOST_VERIFY(!WaitForSingleObject(upgrade_sem,detail::win32::infinite));
- }
- break;
- }
|