From f1ef7c182d22df3e757b7dc4fa2970fc8bf143de Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Wed, 19 Sep 2012 14:24:47 -0400
Subject: digital: fix private access in gr_endian_swap
---
gnuradio-core/src/lib/general/gr_endian_swap.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnuradio-core')
diff --git a/gnuradio-core/src/lib/general/gr_endian_swap.cc b/gnuradio-core/src/lib/general/gr_endian_swap.cc
index d86da5aa72..8bea0ca30d 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:
--
cgit v1.2.3
From 08cf111f1d30ad08965c2892aeed5030d2cec1b2 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 14 Aug 2012 23:00:16 -0700
Subject: core: fix use of private vars in place of API accessor
Conflicts:
gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
---
gnuradio-core/src/lib/general/gr_annotator_raw.cc | 2 +-
gnuradio-core/src/lib/io/gr_tagged_file_sink.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnuradio-core')
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 d698927629..6d642088e2 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;
--
cgit v1.2.3