[Commit-gnuradio] r9234 - gnuradio/branches/developers/nldudok1/gpgpu-wip/gnuradio-core/src/lib/runtime

[nldudok1]

Author: nldudok1
Date: 2008-08-10 21:19:12 -0600 (Sun, 10 Aug 2008)
New Revision: 9234

Modified:
   
gnuradio/branches/developers/nldudok1/gpgpu-wip/gnuradio-core/src/lib/runtime/gr_flowgraph.cc
Log:
solved basic_block sort bug

Modified: 
gnuradio/branches/developers/nldudok1/gpgpu-wip/gnuradio-core/src/lib/runtime/gr_flowgraph.cc
===================================================================
--- 
gnuradio/branches/developers/nldudok1/gpgpu-wip/gnuradio-core/src/lib/runtime/gr_flowgraph.cc
       2008-08-11 00:46:59 UTC (rev 9233)
+++ 
gnuradio/branches/developers/nldudok1/gpgpu-wip/gnuradio-core/src/lib/runtime/gr_flowgraph.cc
       2008-08-11 03:19:12 UTC (rev 9234)
@@ -30,6 +30,11 @@
 #include <sstream>
 
 #define GR_FLOWGRAPH_DEBUG 0
+bool 
+basic_block_sort_predicate(const gr_basic_block_sptr lhs, const 
gr_basic_block_sptr rhs)
+{
+  return lhs->unique_id() < rhs->unique_id();
+}
 
 gr_edge::~gr_edge()
 {
@@ -173,7 +178,8 @@
   }
 
   // Return vector of unique blocks
-  sort(tmp.begin(), tmp.end());
+  //sort(tmp.begin(), tmp.end());
+  sort(tmp.begin(), tmp.end(),basic_block_sort_predicate);
   unique_copy(tmp.begin(), tmp.end(), inserter);
   return result;
 }
@@ -272,7 +278,7 @@
       tmp.push_back(p->dst().block());
 
   // Remove duplicates
-  sort(tmp.begin(), tmp.end());
+  sort(tmp.begin(), tmp.end(),basic_block_sort_predicate);
   unique_copy(tmp.begin(), tmp.end(), inserter);
   return result;
 }
@@ -288,7 +294,7 @@
       tmp.push_back(p->dst().block());
 
   // Remove duplicates
-  sort(tmp.begin(), tmp.end());
+  sort(tmp.begin(), tmp.end(),basic_block_sort_predicate);
   unique_copy(tmp.begin(), tmp.end(), inserter);
   return result;
 }
@@ -399,7 +405,7 @@
   }    
 
   // Remove duplicates
-  sort(tmp.begin(), tmp.end());
+  sort(tmp.begin(), tmp.end(),basic_block_sort_predicate);
   unique_copy(tmp.begin(), tmp.end(), inserter);
   return result;
 }