projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into dfsg-orig
[debian/gnuradio]
/
gnuradio-core
/
src
/
lib
/
runtime
/
gr_top_block_impl.h
diff --git
a/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
b/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
index 35fb44ef92ba7110c4c052e3c96d8a89573fcb8d..ef28dd8292124803f1162b85515b2313d4da0475 100644
(file)
--- a/
gnuradio-core/src/lib/runtime/gr_top_block_impl.h
+++ b/
gnuradio-core/src/lib/runtime/gr_top_block_impl.h
@@
-24,10
+24,7
@@
#define INCLUDED_GR_TOP_BLOCK_IMPL_H
#include <gr_scheduler.h>
#define INCLUDED_GR_TOP_BLOCK_IMPL_H
#include <gr_scheduler.h>
-#include <boost/thread.hpp>
-
-typedef boost::mutex gr_mutex; // FIXME move these elsewhere
-typedef boost::lock_guard<boost::mutex> gr_lock_guard;
+#include <gruel/thread.h>
/*!
*\brief Abstract implementation details of gr_top_block
/*!
*\brief Abstract implementation details of gr_top_block
@@
-69,7
+66,7
@@
protected:
gr_flat_flowgraph_sptr d_ffg;
gr_scheduler_sptr d_scheduler;
gr_flat_flowgraph_sptr d_ffg;
gr_scheduler_sptr d_scheduler;
- gr
_mutex
d_mutex; // protects d_state and d_lock_count
+ gr
uel::mutex
d_mutex; // protects d_state and d_lock_count
tb_state d_state;
int d_lock_count;
tb_state d_state;
int d_lock_count;