diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-08-28 12:03:22 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-08-28 12:03:22 -0700 |
| commit | 67fa1a58925d4b22418fcaffe328a20058e1d77b (patch) | |
| tree | d7327084b63baaedbec4632cbc3f71aa4d4ed46a /gnuradio-core | |
| parent | 933647925708c4349676548705f4e4afcf522926 (diff) | |
| parent | 6e944a77f14794bb143e85779387234ee412774f (diff) | |
Merge remote branch 'jblum/fix_private_access' into next
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_annotator_raw.cc | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_tagged_file_sink.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/gr_annotator_raw.cc b/gnuradio-core/src/lib/general/gr_annotator_raw.cc index e1ae73efb6..d3dcce73af 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_raw.cc +++ b/gnuradio-core/src/lib/general/gr_annotator_raw.cc @@ -55,7 +55,7 @@ void gr_annotator_raw::add_tag(uint64_t offset, pmt_t key, pmt_t val) gruel::scoped_lock l(d_mutex); gr_tag_t tag; - tag.srcid = pmt::pmt_intern(d_name); + tag.srcid = pmt::pmt_intern(name()); tag.key = key; tag.value = val; tag.offset = offset; diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc index c0da23b4f7..c9c8407a07 100644 --- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc +++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc @@ -156,7 +156,7 @@ gr_tagged_file_sink::work (int noutput_items, std::stringstream filename; filename.setf(std::ios::fixed, std::ios::floatfield); filename.precision(8); - filename << "file" << d_unique_id << "_" << d_n << "_" << d_timeval << ".dat"; + filename << "file" << unique_id() << "_" << d_n << "_" << d_timeval << ".dat"; d_n++; int fd; |