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

[jcorgan]

Author: jcorgan
Date: 2006-11-15 15:01:28 -0700 (Wed, 15 Nov 2006)
New Revision: 3988

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_block.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
Log:
Work in progress.

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-11-15 21:24:30 UTC (rev 3987)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-11-15 22:01:28 UTC (rev 3988)
@@ -69,7 +69,6 @@
         d_output_signature = iosig;
     }
 
-        
 public:
     virtual ~gr_basic_block();
     long unique_id() const { return d_unique_id; }
@@ -81,6 +80,9 @@
     void set_parent(gr_basic_block *parent) { d_parent = parent; }
     gr_basic_block *parent() const { return d_parent; }
 
+    virtual void get_child_topology(gr_basic_block_sptr child, int &ninputs, 
int &noutputs)
+        { };
+        
     /*! overridden in gr_hier_block2 to implement tree traversal
      *  otherwise invoke callback with shared pointer to this object
      */

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-11-15 21:24:30 UTC (rev 3987)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
 2006-11-15 22:01:28 UTC (rev 3988)
@@ -124,9 +124,8 @@
     // which may be overridden by descendent classes
 
     int ninputs = 0, noutputs = 0;
-    gr_hier_block2 *parent = dynamic_cast<gr_hier_block2 *>(d_parent);
-    if (parent)
-       parent->get_child_topology(shared_from_this(), ninputs, noutputs);
+    if (d_parent)
+       d_parent->get_child_topology(shared_from_this(), ninputs, noutputs);
 
     return check_topology(ninputs, noutputs);
 }

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-11-15 21:24:30 UTC (rev 3987)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-11-15 22:01:28 UTC (rev 3988)
@@ -48,7 +48,9 @@
      * \brief Private implementation details of gr_hier_block2
      */
     gr_hier_block2_impl *d_impl;
-    
+
+    void get_child_topology(gr_basic_block_sptr child, int &ninputs, int 
&noutputs);
+        
 protected: 
     gr_hier_block2(const std::string &name,
                   gr_io_signature_sptr input_signature,
@@ -66,8 +68,6 @@
 
     // Overrides gr_basic_block, checks validity of connection/component 
databases
     virtual bool validate();
-
-    void get_child_topology(gr_basic_block_sptr child, int &ninputs, int 
&noutputs);
 };
 
 inline std::ostream &operator << (std::ostream &os, gr_basic_block_sptr 
basic_block)