Post merge cleanup.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5239 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.h b/gnuradio-core/src/lib/runtime/gr_block_detail.h
index 9aa5ef4b05dc5556588ce2d5da61af29b8b6c98e..d89b7fea188afcc35258988e3bcfe7ec8d23d64f 100644 (file)
--- 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 6a01482c68f89f894686a22f9fe160df6413dc7e..9ac5ae96d4baa99e5d3294e6830917c6fbaff806 100644 (file)
--- 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 af029bdc76d6a211c68a51ccaa5d8e771ad104b0..4e9380689d27a7eb5603bed4998994bf8df3b915 100644 (file)
--- 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();