[Commit-gnuradio] r3868 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-10-26 18:10:28 -0600 (Thu, 26 Oct 2006)
New Revision: 3868

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.i
Log:
Work in progress. Moved name functionality into gr_basic_block.


Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-10-26 23:46:15 UTC (rev 3867)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-10-27 00:10:28 UTC (rev 3868)
@@ -27,7 +27,8 @@
 #include <gr_basic_block.h>
 #include <stdexcept>
 
-gr_basic_block::gr_basic_block()
+gr_basic_block::gr_basic_block(std::string name) :
+    d_name(name)
 {
 }
   

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-10-26 23:46:15 UTC (rev 3867)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-10-27 00:10:28 UTC (rev 3868)
@@ -29,12 +29,14 @@
 class gr_basic_block
 {
 private:
-    
+    std::string                d_name;
+        
 protected:
-    gr_basic_block();
+    gr_basic_block(const std::string name);
 
 public:
     virtual ~gr_basic_block();
+    std::string name () const { return d_name; }
 };
 
 #endif /* INCLUDED_GR_BASIC_BLOCK_H */

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
    2006-10-26 23:46:15 UTC (rev 3867)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
    2006-10-27 00:10:28 UTC (rev 3868)
@@ -36,6 +36,7 @@
 
 public:
     virtual ~gr_basic_block();
+    std::string name() const;
 };
 
 %pythoncode %{

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
 2006-10-26 23:46:15 UTC (rev 3867)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
 2006-10-27 00:10:28 UTC (rev 3868)
@@ -40,7 +40,7 @@
 gr_block::gr_block (const std::string &name,
                    gr_io_signature_sptr input_signature,
                    gr_io_signature_sptr output_signature)
-  : d_name (name),
+  : gr_basic_block(name),
     d_input_signature (input_signature),
     d_output_signature (output_signature),
     d_output_multiple (1),

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.h
  2006-10-26 23:46:15 UTC (rev 3867)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.h
  2006-10-27 00:10:28 UTC (rev 3868)
@@ -25,7 +25,6 @@
 
 #include <gr_basic_block.h>
 #include <gr_runtime.h>
-#include <string>
 
 /*!
  * \brief The abstract base class for all signal processing blocks.
@@ -56,7 +55,6 @@
   
   virtual ~gr_block ();
   
-  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; }
   long unique_id () const { return d_unique_id; }
@@ -206,7 +204,6 @@
 
  private:
 
-  std::string          d_name;
   gr_io_signature_sptr d_input_signature;
   gr_io_signature_sptr d_output_signature;
   int                  d_output_multiple;

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.i
  2006-10-26 23:46:15 UTC (rev 3867)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.i
  2006-10-27 00:10:28 UTC (rev 3868)
@@ -39,7 +39,6 @@
   
   virtual ~gr_block ();
   
-  std::string name () const;
   gr_io_signature_sptr input_signature () const;
   gr_io_signature_sptr output_signature () const;
   long unique_id () const;