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

[jcorgan]

Author: jcorgan
Date: 2006-11-28 13:07:00 -0700 (Tue, 28 Nov 2006)
New Revision: 4040

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
Log:
Work in progress, preparing for toplogical sort implementation.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
       2006-11-28 19:38:03 UTC (rev 4039)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
       2006-11-28 20:07:00 UTC (rev 4040)
@@ -425,17 +425,6 @@
     return result;
 }
 
-gr_block_vector_t
-gr_simple_flowgraph_detail::topological_sort(gr_block_vector_t blocks)
-{
-    gr_block_vector_t result;
-
-    // NOP for now
-    result = blocks;
-
-    return result;
-}
-
 // Recursively mark all reachable blocks from given block and block list
 void 
 gr_simple_flowgraph_detail::reachable_dfs_visit(gr_block_sptr block, 
gr_block_vector_t &blocks)
@@ -471,3 +460,15 @@
     unique_copy(tmp.begin(), tmp.end(), inserter);
     return result;
 }
+
+gr_block_vector_t
+gr_simple_flowgraph_detail::topological_sort(gr_block_vector_t &blocks)
+{
+    gr_block_vector_t result;
+
+    // NOP for now
+    result = blocks;
+
+    return result;
+}
+

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
        2006-11-28 19:38:03 UTC (rev 4039)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
        2006-11-28 20:07:00 UTC (rev 4040)
@@ -103,7 +103,7 @@
     gr_block_vector_t calc_used_blocks();
     std::vector<gr_block_vector_t> partition();
     gr_block_vector_t calc_reachable_blocks(gr_block_sptr block, 
gr_block_vector_t &blocks);
-    gr_block_vector_t topological_sort(gr_block_vector_t blocks);
+    gr_block_vector_t topological_sort(gr_block_vector_t &blocks);
     void reachable_dfs_visit(gr_block_sptr block, gr_block_vector_t &blocks);
     gr_block_vector_t calc_adjacent_blocks(gr_block_sptr block, 
gr_block_vector_t &blocks);