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
/
io
/
gr_histo_sink_f.h
diff --git
a/gnuradio-core/src/lib/io/gr_histo_sink_f.h
b/gnuradio-core/src/lib/io/gr_histo_sink_f.h
index 640398c60a4a1d960e132f42f436b16610b1c486..8ba45ec55cf5713856e8dd895c7bb37051b902b9 100644
(file)
--- a/
gnuradio-core/src/lib/io/gr_histo_sink_f.h
+++ b/
gnuradio-core/src/lib/io/gr_histo_sink_f.h
@@
-25,7
+25,7
@@
#include <gr_sync_block.h>
#include <gr_msg_queue.h>
#include <gr_sync_block.h>
#include <gr_msg_queue.h>
-#include <
p
thread.h>
+#include <
gruel/
thread.h>
class gr_histo_sink_f;
typedef boost::shared_ptr<gr_histo_sink_f> gr_histo_sink_f_sptr;
class gr_histo_sink_f;
typedef boost::shared_ptr<gr_histo_sink_f> gr_histo_sink_f_sptr;
@@
-45,7
+45,7
@@
private:
unsigned int d_sample_count;
unsigned int *d_bins;
float *d_samps;
unsigned int d_sample_count;
unsigned int *d_bins;
float *d_samps;
-
pthread_mutex_t
d_mutex;
+
gruel::mutex
d_mutex;
friend gr_histo_sink_f_sptr gr_make_histo_sink_f (gr_msg_queue_sptr msgq);
gr_histo_sink_f (gr_msg_queue_sptr msgq);
friend gr_histo_sink_f_sptr gr_make_histo_sink_f (gr_msg_queue_sptr msgq);
gr_histo_sink_f (gr_msg_queue_sptr msgq);