projects / packages / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| c1965bc2 JP |
1 | Regressed by https://github.com/boostorg/date_time/commit/f9f2aaf5216c |
| 2 | ||
| 3 | src/rbd_replay/Replayer.cc:353:65: error: no matching conversion for functional-style cast from 'float' to 'boost::posix_time::microseconds' (aka 'subsecond_duration<boost::posix_time::time_duration, 1000000>') | |
| 4 | boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(dep.time_delta * m_latency_multiplier / 1000)); | |
| 5 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
| 6 | /usr/local/include/boost/date_time/time_duration.hpp:270:30: note: candidate constructor (the implicit copy constructor) not viable: no known conversion from 'float' to 'const boost::date_time::subsecond_duration<boost::posix_time::time_duration, 1000000>' for 1st argument | |
| 7 | class BOOST_SYMBOL_VISIBLE subsecond_duration : public base_duration | |
| 8 | ^ | |
| 9 | /usr/local/include/boost/date_time/time_duration.hpp:270:30: note: candidate constructor (the implicit move constructor) not viable: no known conversion from 'float' to 'boost::date_time::subsecond_duration<boost::posix_time::time_duration, 1000000>' for 1st argument | |
| 10 | /usr/local/include/boost/date_time/time_duration.hpp:286:59: note: candidate template ignored: disabled by 'enable_if' [with T = float] | |
| 11 | typename boost::enable_if<boost::is_integral<T>, void>::type* = 0) : | |
| 12 | ^ | |
| 13 | ||
| 14 | src/test/librbd/test_mock_Journal.cc:485:42: error: reference to '_1' is ambiguous | |
| 15 | std::bind(&invoke_replay_complete, _1, 0)); | |
| 16 | ^ | |
| 17 | /usr/local/include/boost/bind/placeholders.hpp:46:38: note: candidate found by name lookup is 'boost::placeholders::_1' | |
| 18 | BOOST_STATIC_CONSTEXPR boost::arg<1> _1; | |
| 19 | ^ | |
| 20 | /usr/include/c++/v1/functional:2021:21: note: candidate found by name lookup is 'std::__1::placeholders::_1' | |
| 21 | constexpr __ph<1> _1{}; | |
| 22 | ^ | |
| 23 | ||
| 24 | --- src/rbd_replay/Replayer.cc.orig 2018-02-26 21:47:18 UTC | |
| 25 | +++ src/rbd_replay/Replayer.cc | |
| 26 | @@ -350,7 +350,7 @@ void Replayer::wait_for_actions(const action::Dependen | |
| 27 | dout(DEPGRAPH_LEVEL) << "Finished waiting for " << dep.id << " after " << micros << " microseconds" << dendl; | |
| 28 | // Apparently the nanoseconds constructor is optional: | |
| 29 | // http://www.boost.org/doc/libs/1_46_0/doc/html/date_time/details.html#compile_options | |
| 30 | - boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(dep.time_delta * m_latency_multiplier / 1000)); | |
| 31 | + boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(long(dep.time_delta * m_latency_multiplier / 1000))); | |
| 32 | if (sub_release_time > release_time) { | |
| 33 | release_time = sub_release_time; | |
| 34 | } | |
| 35 | --- ceph-0.94.10/src/mon/MDSMonitor.cc.orig 2019-06-03 22:46:11.352201283 +0200 | |
| 36 | +++ ceph-0.94.10/src/mon/MDSMonitor.cc 2019-06-03 22:46:23.110188378 +0200 | |
| 37 | @@ -14,6 +14,7 @@ | |
| 38 | ||
| 39 | #include <sstream> | |
| 40 | #include <boost/utility.hpp> | |
| 41 | +#include <boost/next_prior.hpp> | |
| 42 | ||
| 43 | #include "MDSMonitor.h" | |
| 44 | #include "Monitor.h" |