From 6b1e25d6c62d82369548ecad4b86a0795be23025 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Fri, 4 May 2007 21:59:50 +0000 Subject: [PATCH] Post merge cleanup. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5239 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/runtime/gr_block_detail.h | 8 -------- gnuradio-core/src/lib/runtime/gr_block_detail.i | 8 -------- gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.h b/gnuradio-core/src/lib/runtime/gr_block_detail.h index 9aa5ef4b..d89b7fea 100644 --- a/gnuradio-core/src/lib/runtime/gr_block_detail.h +++ b/gnuradio-core/src/lib/runtime/gr_block_detail.h @@ -55,14 +55,6 @@ class gr_block_detail { return d_input[which]; } - void clear_input (unsigned int which) - { - if (which >= d_ninputs) - throw std::invalid_argument ("gr_block_detail::input"); - if (d_input[which]) - d_input[which].reset(); - } - void set_output (unsigned int which, gr_buffer_sptr buffer); gr_buffer_sptr output (unsigned int which) { diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.i b/gnuradio-core/src/lib/runtime/gr_block_detail.i index 6a01482c..9ac5ae96 100644 --- a/gnuradio-core/src/lib/runtime/gr_block_detail.i +++ b/gnuradio-core/src/lib/runtime/gr_block_detail.i @@ -46,14 +46,6 @@ class gr_block_detail { return d_input[which]; } - void clear_input (unsigned int which) - { - if (which >= d_ninputs) - throw std::invalid_argument ("gr_block_detail::input"); - if (d_input[which]) - d_input[which].reset(); - } - void set_output (unsigned int which, gr_buffer_sptr buffer); gr_buffer_sptr output (unsigned int which) { diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc b/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc index af029bdc..4e938068 100644 --- a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc +++ b/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc @@ -55,7 +55,7 @@ gr_hier_block2_detail::connect(gr_basic_block_sptr src, int src_port, if (src.get() == dst.get()) throw std::invalid_argument("src and destination blocks cannot be the same"); - // Connectments to block inputs or outputs + // Connections to block inputs or outputs int max_port; if (src.get() == d_owner) { max_port = src->input_signature()->max_streams(); -- 2.47.2