mongodb-3.2.4-boost-1.60.patch 3.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485
  1. Fix issues caused by boost::none changes.
  2. See also: https://bugs.gentoo.org/show_bug.cgi?id=578846
  3. Adapted from: https://github.com/mongodb/mongo/commit/92c3f80f384d2825efeabd0d26aa534c0deb6988
  4. --- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp
  5. +++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor.cpp
  6. @@ -47,7 +47,7 @@
  7. if (_referenceDoc.isEmpty()) {
  8. FTDCBSONUtil::extractMetricsFromDocument(sample, sample, &_metrics);
  9. _reset(sample, date);
  10. - return {boost::none_t()};
  11. + return {boost::none};
  12. }
  13. _metrics.resize(0);
  14. @@ -107,7 +107,7 @@
  15. }
  16. // The buffer is not full, inform the caller
  17. - return {boost::none_t()};
  18. + return {boost::none};
  19. }
  20. StatusWith<std::tuple<ConstDataRange, Date_t>> FTDCCompressor::getCompressedSamples() {
  21. --- mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp
  22. +++ mongodb-src-r3.2.4/src/mongo/db/ftdc/compressor_test.cpp
  23. @@ -122,7 +122,7 @@
  24. TestTie() : _compressor(&_config) {}
  25. ~TestTie() {
  26. - validate(boost::none_t());
  27. + validate(boost::none);
  28. }
  29. StatusWith<boost::optional<std::tuple<ConstDataRange, FTDCCompressor::CompressorState, Date_t>>>
  30. --- mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp
  31. +++ mongodb-src-r3.2.4/src/mongo/db/ftdc/file_writer.cpp
  32. @@ -205,7 +205,7 @@
  33. Status FTDCFileWriter::close() {
  34. if (_archiveStream.is_open()) {
  35. - Status s = flush(boost::none_t(), Date_t());
  36. + Status s = flush(boost::none, Date_t());
  37. _archiveStream.close();
  38. --- mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp
  39. +++ mongodb-src-r3.2.4/src/mongo/util/concurrency/shared_mutex_win.hpp
  40. @@ -175,7 +175,7 @@
  41. return true;
  42. }
  43. - unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
  44. + unsigned long const res=WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
  45. if(res==detail::win32::timeout)
  46. {
  47. for(;;)
  48. @@ -328,7 +328,7 @@
  49. {
  50. return true;
  51. }
  52. - unsigned long const wait_res=detail::win32::WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
  53. + unsigned long const wait_res=WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
  54. if(wait_res==detail::win32::timeout)
  55. {
  56. for(;;)
  57. @@ -421,7 +421,7 @@
  58. return;
  59. }
  60. - BOOST_VERIFY(!detail::win32::WaitForSingleObject(unlock_sem,detail::win32::infinite));
  61. + BOOST_VERIFY(!WaitForSingleObject(unlock_sem,detail::win32::infinite));
  62. }
  63. }
  64. @@ -502,7 +502,7 @@
  65. {
  66. if(!last_reader)
  67. {
  68. - BOOST_VERIFY(!detail::win32::WaitForSingleObject(upgrade_sem,detail::win32::infinite));
  69. + BOOST_VERIFY(!WaitForSingleObject(upgrade_sem,detail::win32::infinite));
  70. }
  71. break;
  72. }