diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-27 08:34:04 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-27 08:34:04 -0700 |
| commit | 8497eb2ac016f72e2b9a9028e5126bc73f5b0c9a (patch) | |
| tree | 531c641c3b868e33f3275196dffbb885a60deddc /host/lib | |
| parent | 1ba93e70a6a79dc06bd9ba09a72e2798debede9b (diff) | |
| parent | 8bf1ad45de2c81e5bea9f2ba4330ee1f8ce18bc7 (diff) | |
| download | uhd-8497eb2ac016f72e2b9a9028e5126bc73f5b0c9a.tar.gz uhd-8497eb2ac016f72e2b9a9028e5126bc73f5b0c9a.tar.bz2 uhd-8497eb2ac016f72e2b9a9028e5126bc73f5b0c9a.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/types.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/types.cpp b/host/lib/types.cpp index 08e41b62f..14f7651d4 100644 --- a/host/lib/types.cpp +++ b/host/lib/types.cpp @@ -105,9 +105,9 @@ tx_metadata_t::tx_metadata_t(void){ /*********************************************************************** * time spec **********************************************************************/ -time_spec_t::time_spec_t(boost::uint32_t new_secs, double new_nsecs){ - secs = new_secs; - nsecs = new_nsecs; +time_spec_t::time_spec_t(boost::uint32_t secs_, double nsecs_){ + secs = secs_; + nsecs = nsecs_; } boost::uint32_t time_spec_t::get_ticks(double tick_rate) const{ |