diff options
| author | Johnathan Corgan | 2012-10-13 11:55:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-10-13 11:55:40 -0700 |
| commit | 136050324a6f5023a6b549b158fef1a0de9e1d79 (patch) | |
| tree | 731b378fc1220b81b912e073f35917dc971045c0 /gr-uhd | |
| parent | 2267dee5f36f28004cf844a5e495194edb00a67b (diff) | |
| parent | 5b97216d8d62580b4c9224fb2ad630ade61c0a4f (diff) | |
| download | gnuradio-136050324a6f5023a6b549b158fef1a0de9e1d79.tar.gz gnuradio-136050324a6f5023a6b549b158fef1a0de9e1d79.tar.bz2 gnuradio-136050324a6f5023a6b549b158fef1a0de9e1d79.zip | |
Merge branch 'maint'
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/examples/c++/tag_sink_demo.h | 4 | ||||
| -rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_sink.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-uhd/examples/c++/tag_sink_demo.h b/gr-uhd/examples/c++/tag_sink_demo.h index 207cc47e6..5417bd324 100644 --- a/gr-uhd/examples/c++/tag_sink_demo.h +++ b/gr-uhd/examples/c++/tag_sink_demo.h @@ -55,8 +55,8 @@ public: const pmt::pmt_t &value = rx_time_tag.value; std::cout << boost::format("Full seconds %u, Frac seconds %f, abs sample offset %u") - % pmt::pmt_to_uint64(pmt_tuple_ref(value, 0)) - % pmt::pmt_to_double(pmt_tuple_ref(value, 1)) + % pmt::pmt_to_uint64(pmt::pmt_tuple_ref(value, 0)) + % pmt::pmt_to_double(pmt::pmt_tuple_ref(value, 1)) % offset << std::endl; } diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc index 6c1688ea0..6216c94a8 100644 --- a/gr-uhd/lib/gr_uhd_usrp_sink.cc +++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc @@ -389,8 +389,8 @@ public: else if (pmt::pmt_equal(key, TIME_KEY)){ _metadata.has_time_spec = true; _metadata.time_spec = uhd::time_spec_t( - pmt::pmt_to_uint64(pmt_tuple_ref(value, 0)), - pmt::pmt_to_double(pmt_tuple_ref(value, 1)) + pmt::pmt_to_uint64(pmt::pmt_tuple_ref(value, 0)), + pmt::pmt_to_double(pmt::pmt_tuple_ref(value, 1)) ); } } |