Merge r11462:11485 from jcorgan/omni into trunk.

[debian/gnuradio] / gnuradio-core / src / lib / runtime / gr_tpb_detail.h

diff --git a/gnuradio-core/src/lib/runtime/gr_tpb_detail.h b/gnuradio-core/src/lib/runtime/gr_tpb_detail.h
index 9566312dc82a126892ed19b5a440d47c941cd44a..ab955240b3ad0daaad399ed12cccd1080c41b57f 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_tpb_detail.h
+++ b/gnuradio-core/src/lib/runtime/gr_tpb_detail.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GR_TPB_DETAIL_H
 #define INCLUDED_GR_TPB_DETAIL_H
 
-#include <boost/thread.hpp>
+#include <gruel/thread.h>
 
 class gr_block_detail;
 
@@ -29,13 +29,12 @@ class gr_block_detail;
  * \brief used by thread-per-block scheduler
  */
 struct gr_tpb_detail {
-  typedef boost::unique_lock<boost::mutex>  scoped_lock;
 
-  boost::mutex                 mutex;                  //< protects all vars
+  gruel::mutex                 mutex;                  //< protects all vars
   bool                         input_changed;
-  boost::condition_variable    input_cond;
+  gruel::condition_variable    input_cond;
   bool                         output_changed;
-  boost::condition_variable    output_cond;
+  gruel::condition_variable    output_cond;
 
   gr_tpb_detail()
     : input_changed(false), output_changed(false) {}
@@ -53,7 +52,7 @@ struct gr_tpb_detail {
   //! Called by us
   void clear_changed()
   {
-    scoped_lock        guard(mutex);
+    gruel::scoped_lock guard(mutex);
     input_changed = false;
     output_changed = false;
   }
@@ -63,7 +62,7 @@ private:
   //! Used by notify_downstream
   void set_input_changed()
   {
-    scoped_lock        guard(mutex);
+    gruel::scoped_lock guard(mutex);
     input_changed = true;
     input_cond.notify_one();
   }
@@ -71,7 +70,7 @@ private:
   //! Used by notify_upstream
   void set_output_changed()
   {
-    scoped_lock        guard(mutex);
+    gruel::scoped_lock guard(mutex);
     output_changed = true;
     output_cond.notify_one();
   }