diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-18 08:15:15 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-18 08:15:15 +0000 |
| commit | d105f614477c7f2a4f24a4efc802de7eb750bd7a (patch) | |
| tree | 6c5f6e615f153862e546e5fb3879a400b73bfec1 /host/lib/time_spec.cpp | |
| parent | 5de235715b36ef9a98ea418832a5382cbf25d4d6 (diff) | |
| parent | f2a86eb6389210a8ebd475782ab707f814c6e49c (diff) | |
| download | uhd-d105f614477c7f2a4f24a4efc802de7eb750bd7a.tar.gz uhd-d105f614477c7f2a4f24a4efc802de7eb750bd7a.tar.bz2 uhd-d105f614477c7f2a4f24a4efc802de7eb750bd7a.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into u1e_uhd
Diffstat (limited to 'host/lib/time_spec.cpp')
| -rw-r--r-- | host/lib/time_spec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/time_spec.cpp b/host/lib/time_spec.cpp index 193441342..210010394 100644 --- a/host/lib/time_spec.cpp +++ b/host/lib/time_spec.cpp @@ -24,17 +24,17 @@ time_spec_t::time_spec_t(void){ ticks = ~0; } -time_spec_t::time_spec_t(uint32_t new_secs, uint32_t new_ticks){ +time_spec_t::time_spec_t(boost::uint32_t new_secs, boost::uint32_t new_ticks){ secs = new_secs; ticks = new_ticks; } static const boost::posix_time::ptime epoch(boost::gregorian::date(1970,1,1)); -static double time_tick_rate(boost::posix_time::time_duration::ticks_per_second()); +static double time_tick_rate = double(boost::posix_time::time_duration::ticks_per_second()); time_spec_t::time_spec_t(boost::posix_time::ptime time, double tick_rate){ boost::posix_time::time_duration td = time - epoch; - secs = td.total_seconds(); + secs = boost::uint32_t(td.total_seconds()); double time_ticks_per_device_ticks = time_tick_rate/tick_rate; - ticks = td.fractional_seconds()/time_ticks_per_device_ticks; + ticks = boost::uint32_t(td.fractional_seconds()/time_ticks_per_device_ticks); } |