6 files changed, 5 insertions, 97 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h
index 2adca8ccb..7e95509e2 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h
@@ -103,7 +103,7 @@ public:
     std::string name() const { return d_name; }
     gr_io_signature_sptr input_signature() const  { return d_input_signature; }
     gr_io_signature_sptr output_signature() const { return d_output_signature; }
-    gr_basic_block_sptr to_basic_block(); // Needed for Python/Guile type coercion
+    gr_basic_block_sptr to_basic_block(); // Needed for Python type coercion
 
     /*!
      * \brief Confirm that ninputs and noutputs is an acceptable combination.
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.h b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
index 9652f6bf4..12bcf10e7 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.h
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
@@ -150,7 +150,7 @@ public:
   // ignored by the user.
   gr_flat_flowgraph_sptr flatten() const;
 
-  gr_hier_block2_sptr to_hier_block2(); // Needed for Python/Guile type coercion
+  gr_hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
 };
 
 inline gr_hier_block2_sptr cast_to_hier_block2_sptr(gr_basic_block_sptr block) {
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.i b/gnuradio-core/src/lib/runtime/gr_hier_block2.i
index 32b656e24..4fa7c3bc0 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.i
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.i
@@ -63,5 +63,5 @@ public:
   void lock();
   void unlock();
 
-  gr_hier_block2_sptr to_hier_block2(); // Needed for Python/Guile type coercion
+  gr_hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
 };
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.i b/gnuradio-core/src/lib/runtime/gr_msg_queue.i
index 0a4eda78a..2a78253b3 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_queue.i
+++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.i
@@ -105,64 +105,3 @@ gr_msg_queue_sptr.insert_tail = gr_py_msg_queue__insert_tail
 gr_msg_queue_sptr.handle = gr_py_msg_queue__insert_tail
 %}
 #endif	// SWIGPYTHON
-
-/*
- * Similar trickery as above, only this time for Guile
- */
-#ifdef SWIGGUILE
-
-%{
-  struct arg_holder {
-    gr_msg_queue_sptr	q;
-    gr_message_sptr	msg;
-  };
-
-  static void *
-  insert_tail_shim(void *arg)
-  {
-    arg_holder *a = (arg_holder *)arg;
-    a->q->insert_tail(a->msg);
-    return 0;
-  }
-
-  static void *
-  delete_head_shim(void *arg)
-  {
-    arg_holder *a = (arg_holder *)arg;
-    a->msg = a->q->delete_head();
-    return 0;
-  }
-%}
-
-%inline %{
-
-  // handle and insert_tail are equivalent
-  static void
-  handle(gr_msg_queue_sptr q, gr_message_sptr msg)
-  {
-    arg_holder	a;
-    a.q = q;
-    a.msg = msg;
-    scm_without_guile(insert_tail_shim, (void *) &a);
-  }
-
-  static void
-  insert_tail(gr_msg_queue_sptr q, gr_message_sptr msg)
-  {
-    arg_holder	a;
-    a.q = q;
-    a.msg = msg;
-    scm_without_guile(insert_tail_shim, (void *) &a);
-  }
-
-  static gr_message_sptr
-  delete_head(gr_msg_queue_sptr q)
-  {
-    arg_holder	a;
-    a.q = q;
-    scm_without_guile(delete_head_shim, (void *) &a);
-    return a.msg;
-  }
-%}
-
-#endif	// SWIGGUILE
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.h b/gnuradio-core/src/lib/runtime/gr_top_block.h
index 9d01ba3ef..e837700c3 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.h
@@ -122,7 +122,7 @@ public:
   //! Set the maximum number of noutput_items in the flowgraph
   void set_max_noutput_items(int nmax);
 
-  gr_top_block_sptr to_top_block(); // Needed for Python/Guile type coercion
+  gr_top_block_sptr to_top_block(); // Needed for Python type coercion
 };
 
 inline gr_top_block_sptr cast_to_top_block_sptr(gr_basic_block_sptr block) {
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.i b/gnuradio-core/src/lib/runtime/gr_top_block.i
index 70c627ffd..ea5534c17 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.i
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.i
@@ -51,7 +51,7 @@ public:
   int max_noutput_items();
   void set_max_noutput_items(int nmax);
 
-  gr_top_block_sptr to_top_block(); // Needed for Python/Guile type coercion
+  gr_top_block_sptr to_top_block(); // Needed for Python type coercion
 };
 
 #ifdef SWIGPYTHON
@@ -73,34 +73,3 @@ void top_block_wait_unlocked(gr_top_block_sptr r) throw (std::runtime_error)
 %}
 
 #endif
-
-#ifdef SWIGGUILE
-
-%{
-  struct tb_arg_holder {
-    gr_top_block_sptr	tb;
-  };
-
-  static void *
-  tb_wait_shim(void *arg)
-  {
-    tb_arg_holder *a = (tb_arg_holder *)arg;
-    a->tb->wait();
-    return 0;
-  }
-
-%}
-
-%inline %{
-
-  static void
-  top_block_wait_unlocked(gr_top_block_sptr r) throw (std::runtime_error)
-  {
-    tb_arg_holder a;
-    a.tb = r;
-    scm_without_guile(tb_wait_shim, (void *) &a);
-  }
-
-%}
-
-#endif