diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
| commit | fc54c27b48028c9c8139175d40b4b061800f32e3 (patch) | |
| tree | bd4ef22159d5bd65458e50fb3e5050a9b63559bf /host/lib/usrp/usrp2/io_impl.cpp | |
| parent | 9fe731cc371efee7f0051186697e611571c5b41b (diff) | |
| parent | 33c0b32db12ee154b1090360fbf76634590fdd3e (diff) | |
| download | uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.gz uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.bz2 uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp2/io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index ae39028a1..199436fa2 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -50,10 +50,6 @@ static UHD_INLINE pt::time_duration to_time_dur(double timeout){ return pt::microseconds(long(timeout*1e6)); } -static UHD_INLINE double from_time_dur(const pt::time_duration &time_dur){ - return 1e-6*time_dur.total_microseconds(); -} - /*********************************************************************** * constants **********************************************************************/ |