You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.3 KiB
32 lines
1.3 KiB
diff -Naur ceph-10.2.10-orig/src/rbd_replay/Replayer.cc ceph-10.2.10/src/rbd_replay/Replayer.cc
|
|
--- ceph-10.2.10-orig/src/rbd_replay/Replayer.cc 2017-10-04 16:19:25.000000000 +0200
|
|
+++ ceph-10.2.10/src/rbd_replay/Replayer.cc 2019-08-11 11:44:11.678127039 +0200
|
|
@@ -12,6 +12,8 @@
|
|
*
|
|
*/
|
|
|
|
+#define BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
|
|
+
|
|
#include "Replayer.hpp"
|
|
#include "common/errno.h"
|
|
#include "rbd_replay/ActionTypes.h"
|
|
@@ -23,9 +25,9 @@
|
|
#include "global/global_context.h"
|
|
#include "rbd_replay_debug.hpp"
|
|
|
|
-
|
|
using namespace std;
|
|
using namespace rbd_replay;
|
|
+//using namespace boost::posix_time;
|
|
|
|
namespace {
|
|
|
|
@@ -339,7 +341,7 @@
|
|
dout(DEPGRAPH_LEVEL) << "Finished waiting for " << dep.id << " after " << micros << " microseconds" << dendl;
|
|
// Apparently the nanoseconds constructor is optional:
|
|
// http://www.boost.org/doc/libs/1_46_0/doc/html/date_time/details.html#compile_options
|
|
- boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(dep.time_delta * m_latency_multiplier / 1000));
|
|
+ boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(int64_t(dep.time_delta * m_latency_multiplier / 1000)));
|
|
if (sub_release_time > release_time) {
|
|
release_time = sub_release_time;
|
|
}
|