From 7fa1f6ed0726ff0f908245e43a01f50620293e8d Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 24 Aug 2017 15:48:42 -0700 Subject: uhd: Moved get_system_time outside of public API uhd::get_system_time() is an abstracted way of reading back a time, and is not UHD-specific. As such, there's no reason to keep it in the public part of the API where we're contractually obligated not to touch it. Instead, moving it to the internal API space. --- host/lib/usrp/common/recv_packet_demuxer_3000.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'host/lib/usrp/common') diff --git a/host/lib/usrp/common/recv_packet_demuxer_3000.hpp b/host/lib/usrp/common/recv_packet_demuxer_3000.hpp index 8b0aa9ee0..74807741f 100644 --- a/host/lib/usrp/common/recv_packet_demuxer_3000.hpp +++ b/host/lib/usrp/common/recv_packet_demuxer_3000.hpp @@ -8,6 +8,7 @@ #ifndef INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_3000_HPP #define INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_3000_HPP +#include #include #include #include @@ -35,12 +36,13 @@ namespace uhd{ namespace usrp{ transport::managed_recv_buffer::sptr get_recv_buff(const uint32_t sid, const double timeout) { - const time_spec_t exit_time = time_spec_t(timeout) + time_spec_t::get_system_time(); + const time_spec_t exit_time = + time_spec_t(timeout) + uhd::get_system_time(); transport::managed_recv_buffer::sptr buff; buff = _internal_get_recv_buff(sid, timeout); while (not buff) //loop until timeout { - const time_spec_t delta = exit_time - time_spec_t::get_system_time(); + const time_spec_t delta = exit_time - uhd::get_system_time(); const double new_timeout = delta.get_real_secs(); if (new_timeout < 0.0) break; buff = _internal_get_recv_buff(sid, new_timeout); -- cgit v1.2.3