[Commit-gnuradio] r5239 - gnuradio/trunk/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2007-05-04 15:59:50 -0600 (Fri, 04 May 2007)
New Revision: 5239

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.h
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.i
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
Log:
Post merge cleanup.

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.h      
2007-05-04 21:50:13 UTC (rev 5238)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.h      
2007-05-04 21:59:50 UTC (rev 5239)
@@ -55,14 +55,6 @@
     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)
   {

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.i      
2007-05-04 21:50:13 UTC (rev 5238)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_block_detail.i      
2007-05-04 21:59:50 UTC (rev 5239)
@@ -46,14 +46,6 @@
     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)
   {

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc       
2007-05-04 21:50:13 UTC (rev 5238)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc       
2007-05-04 21:59:50 UTC (rev 5239)
@@ -55,7 +55,7 @@
   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();