diff options
| author | rfree2monero <rfreemonero@op.pl> | 2015-04-01 19:00:45 +0200 |
|---|---|---|
| committer | rfree2monero <rfreemonero@op.pl> | 2015-04-01 19:00:45 +0200 |
| commit | c511abf0058b8c1d020255faaad418b0ffd2eb26 (patch) | |
| tree | 26c4cd88d16e79d5dc59fb3bfc43d399fb2239a3 /src/p2p/network_throttle-detail.cpp | |
| parent | Merge remote-tracking branch 'monero-official/master' into network-1.6-work1 (diff) | |
| download | monero-c511abf0058b8c1d020255faaad418b0ffd2eb26.tar.xz | |
remerged; commands JSON. logging upgrade. doxygen
Diffstat (limited to '')
| -rw-r--r-- | src/p2p/network_throttle-detail.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/p2p/network_throttle-detail.cpp b/src/p2p/network_throttle-detail.cpp index 7426e6dc7..6fa27b62a 100644 --- a/src/p2p/network_throttle-detail.cpp +++ b/src/p2p/network_throttle-detail.cpp @@ -330,10 +330,13 @@ void network_throttle::calculate_times(size_t packet_size, calculate_times_struc } double network_throttle::get_time_seconds() const { - using namespace std::chrono; - auto point = steady_clock::now(); + #if defined(__APPLE__) + auto point = std::chrono::system_clock::now(); + #else + auto point = std::chrono::steady_clock::now(); + #endif auto time_from_epoh = point.time_since_epoch(); - auto ms = duration_cast< milliseconds >( time_from_epoh ).count(); + auto ms = std::chrono::duration_cast< std::chrono::milliseconds >( time_from_epoh ).count(); double ms_f = ms; return ms_f / 1000.; } |