9 files changed, 46 insertions, 37 deletions
diff --git a/gnuradio-core/src/lib/general/gr_nop.cc b/gnuradio-core/src/lib/general/gr_nop.cc
index e69c8b340..950ef878e 100644
--- a/gnuradio-core/src/lib/general/gr_nop.cc
+++ b/gnuradio-core/src/lib/general/gr_nop.cc
@@ -33,7 +33,7 @@ gr_nop::gr_nop (size_t sizeof_stream_item)
 {
 }
 
-gr_block_sptr
+gr_nop_sptr
 gr_make_nop (size_t sizeof_stream_item)
 {
   return gnuradio::get_initial_sptr (new gr_nop (sizeof_stream_item));
diff --git a/gnuradio-core/src/lib/general/gr_nop.h b/gnuradio-core/src/lib/general/gr_nop.h
index 60b20c5ab..4f18c9183 100644
--- a/gnuradio-core/src/lib/general/gr_nop.h
+++ b/gnuradio-core/src/lib/general/gr_nop.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,14 +26,19 @@
 #include <gr_block.h>
 #include <stddef.h>			// size_t
 
+class gr_nop;
+typedef boost::shared_ptr<gr_nop> gr_nop_sptr;
+
+gr_nop_sptr
+gr_make_nop (size_t sizeof_stream_item);
+
 /*!
  * \brief Does nothing.  Used for testing only.
  * \ingroup misc_blk
  */
 class gr_nop : public gr_block
 {
-  friend gr_block_sptr gr_make_nop (size_t sizeof_stream_item);
-
+  friend gr_nop_sptr gr_make_nop (size_t sizeof_stream_item);
   gr_nop (size_t sizeof_stream_item);
 
  public:
@@ -43,7 +48,4 @@ class gr_nop : public gr_block
 			    gr_vector_void_star &output_items);
 };
 
-gr_block_sptr
-gr_make_nop (size_t sizeof_stream_item);
-
 #endif /* INCLUDED_GR_NOP_H */
diff --git a/gnuradio-core/src/lib/general/gr_nop.i b/gnuradio-core/src/lib/general/gr_nop.i
index 8220e5c6c..85354d421 100644
--- a/gnuradio-core/src/lib/general/gr_nop.i
+++ b/gnuradio-core/src/lib/general/gr_nop.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,11 +20,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%ignore gr_nop;
+GR_SWIG_BLOCK_MAGIC(gr,nop)
+
+gr_nop_sptr gr_make_nop (size_t sizeof_stream_item);
+
 class gr_nop : public gr_block {
-  friend gr_block_sptr gr_make_nop (size_t sizeof_stream_item);
+private:
   gr_nop (size_t sizeof_stream_item);
 };
 
-%rename(nop) gr_make_nop;
-gr_block_sptr gr_make_nop (size_t sizeof_stream_item);
diff --git a/gnuradio-core/src/lib/general/gr_null_sink.cc b/gnuradio-core/src/lib/general/gr_null_sink.cc
index 0b7f2d9e8..67ef57a46 100644
--- a/gnuradio-core/src/lib/general/gr_null_sink.cc
+++ b/gnuradio-core/src/lib/general/gr_null_sink.cc
@@ -34,7 +34,7 @@ gr_null_sink::gr_null_sink (size_t sizeof_stream_item)
 {
 }
 
-gr_block_sptr
+gr_null_sink_sptr
 gr_make_null_sink (size_t sizeof_stream_item)
 {
   return gnuradio::get_initial_sptr (new gr_null_sink (sizeof_stream_item));
diff --git a/gnuradio-core/src/lib/general/gr_null_sink.h b/gnuradio-core/src/lib/general/gr_null_sink.h
index 66df5d138..6d00382a5 100644
--- a/gnuradio-core/src/lib/general/gr_null_sink.h
+++ b/gnuradio-core/src/lib/general/gr_null_sink.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,15 +26,20 @@
 #include <gr_sync_block.h>
 #include <stddef.h>			// size_t
 
+class gr_null_sink;
+typedef boost::shared_ptr<gr_null_sink> gr_null_sink_sptr;
+
+gr_null_sink_sptr
+gr_make_null_sink (size_t sizeof_stream_item);
+
+
 /*!
  * \brief Bit bucket
  * \ingroup sink_blk
  */
- 
 class gr_null_sink : public gr_sync_block
 {
-  friend gr_block_sptr gr_make_null_sink (size_t sizeof_stream_item);
-
+  friend gr_null_sink_sptr gr_make_null_sink (size_t sizeof_stream_item);
   gr_null_sink (size_t sizeof_stream_item);
 
  public:
@@ -45,7 +50,4 @@ class gr_null_sink : public gr_sync_block
 
 };
 
-gr_block_sptr
-gr_make_null_sink (size_t sizeof_stream_item);
-
 #endif /* INCLUDED_GR_NULL_SINK_H */
diff --git a/gnuradio-core/src/lib/general/gr_null_sink.i b/gnuradio-core/src/lib/general/gr_null_sink.i
index fc4bcffda..e739ce118 100644
--- a/gnuradio-core/src/lib/general/gr_null_sink.i
+++ b/gnuradio-core/src/lib/general/gr_null_sink.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,11 +20,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%ignore gr_null_sink;
+GR_SWIG_BLOCK_MAGIC(gr,null_sink)
+
+gr_null_sink_sptr gr_make_null_sink (size_t sizeof_stream_item);
+
 class gr_null_sink : public gr_sync_block {
-  friend gr_block_sptr gr_make_null_sink (size_t sizeof_stream_item);
+private:
   gr_null_sink (size_t sizeof_stream_item);
 };
 
-%rename(null_sink) gr_make_null_sink;
-gr_block_sptr gr_make_null_sink (size_t sizeof_stream_item);
diff --git a/gnuradio-core/src/lib/general/gr_null_source.cc b/gnuradio-core/src/lib/general/gr_null_source.cc
index b65c39035..85fd2db4b 100644
--- a/gnuradio-core/src/lib/general/gr_null_source.cc
+++ b/gnuradio-core/src/lib/general/gr_null_source.cc
@@ -35,7 +35,7 @@ gr_null_source::gr_null_source (size_t sizeof_stream_item)
 {
 }
 
-gr_block_sptr
+gr_null_source_sptr
 gr_make_null_source (size_t sizeof_stream_item)
 {
   return gnuradio::get_initial_sptr (new gr_null_source (sizeof_stream_item));
diff --git a/gnuradio-core/src/lib/general/gr_null_source.h b/gnuradio-core/src/lib/general/gr_null_source.h
index 63b1939bf..b1a46a195 100644
--- a/gnuradio-core/src/lib/general/gr_null_source.h
+++ b/gnuradio-core/src/lib/general/gr_null_source.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,14 +25,19 @@
 
 #include <gr_sync_block.h>
 
+class gr_null_source;
+typedef boost::shared_ptr<gr_null_source> gr_null_source_sptr;
+
+gr_null_source_sptr
+gr_make_null_source (size_t sizeof_stream_item);
+
 /*!
  * \brief A source of zeros.
  * \ingroup source_blk
  */
-
 class gr_null_source : public gr_sync_block
 {
-  friend gr_block_sptr gr_make_null_source (size_t sizeof_stream_item);
+  friend gr_null_source_sptr gr_make_null_source (size_t sizeof_stream_item);
 
   gr_null_source (size_t sizeof_stream_item);
 
@@ -43,7 +48,4 @@ class gr_null_source : public gr_sync_block
   
 };
 
-gr_block_sptr
-gr_make_null_source (size_t sizeof_stream_item);
-
 #endif /* INCLUDED_GR_NULL_SOURCE_H */
diff --git a/gnuradio-core/src/lib/general/gr_null_source.i b/gnuradio-core/src/lib/general/gr_null_source.i
index f9ddef86f..133161d0a 100644
--- a/gnuradio-core/src/lib/general/gr_null_source.i
+++ b/gnuradio-core/src/lib/general/gr_null_source.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,11 +20,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%ignore gr_null_source;
+GR_SWIG_BLOCK_MAGIC(gr,null_source)
+
+gr_null_source_sptr gr_make_null_source (size_t sizeof_stream_item);
+
 class gr_null_source : public gr_sync_block {
-  friend gr_block_sptr gr_make_null_source (size_t sizeof_stream_item);
+private:
   gr_null_source (size_t sizeof_stream_item);
 };
 
-%rename(null_source) gr_make_null_source;
-gr_block_sptr gr_make_null_source (size_t sizeof_stream_item);