diff options
| author | Johnathan Corgan | 2012-09-28 10:30:00 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-09-28 10:30:00 -0700 |
| commit | 9f72b877043cd6e5d8e7cee20c0e4390419a94b7 (patch) | |
| tree | 6153cac52ba96f11ae756a104bbe9b7afd5a5d98 /gnuradio-core/src/lib | |
| parent | 2d2afd3b387bd3426cc30239f679d48cefe9eb93 (diff) | |
| parent | 515d1b6f91f5dd28997525b1e88006bbfc0f170a (diff) | |
| download | gnuradio-9f72b877043cd6e5d8e7cee20c0e4390419a94b7.tar.gz gnuradio-9f72b877043cd6e5d8e7cee20c0e4390419a94b7.tar.bz2 gnuradio-9f72b877043cd6e5d8e7cee20c0e4390419a94b7.zip | |
Merge branch 'master' into wip/gr-blocks-master
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_annotator_raw.cc | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_endian_swap.cc | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_tagged_file_sink.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-core/src/lib/general/gr_annotator_raw.cc b/gnuradio-core/src/lib/general/gr_annotator_raw.cc index e1ae73efb..d3dcce73a 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/general/gr_endian_swap.cc b/gnuradio-core/src/lib/general/gr_endian_swap.cc index d86da5aa7..8bea0ca30 100644 --- a/gnuradio-core/src/lib/general/gr_endian_swap.cc +++ b/gnuradio-core/src/lib/general/gr_endian_swap.cc @@ -51,7 +51,7 @@ gr_endian_swap::work (int noutput_items, const char *in = (const char *) input_items[0]; char *out = (char *) output_items[0]; - int nbytes( d_output_signature->sizeof_stream_item(0) ); + int nbytes( output_signature()->sizeof_stream_item(0) ); if(is_unaligned()) { switch(nbytes){ case 1: 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 d69892762..6d642088e 100644 --- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc +++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc @@ -143,7 +143,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_n << "_" << d_timeval << ".dat"; + filename << "file" << unique_id() << "_" << d_n << "_" << d_timeval << ".dat"; d_n++; int fd; |