diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gnuradio-runtime/include/gr_buffer.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/include/gr_buffer.h')
| -rw-r--r-- | gnuradio-runtime/include/gr_buffer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-runtime/include/gr_buffer.h b/gnuradio-runtime/include/gr_buffer.h index 1a10ba6d8d..810879b7ea 100644 --- a/gnuradio-runtime/include/gr_buffer.h +++ b/gnuradio-runtime/include/gr_buffer.h @@ -26,7 +26,7 @@ #include <gr_runtime_api.h> #include <gr_runtime_types.h> #include <boost/weak_ptr.hpp> -#include <gruel/thread.h> +#include <thread/thread.h> #include <gr_tags.h> #include <deque> @@ -89,7 +89,7 @@ class GR_RUNTIME_API gr_buffer { size_t nreaders() const { return d_readers.size(); } gr_buffer_reader* reader(size_t index) { return d_readers[index]; } - gruel::mutex *mutex() { return &d_mutex; } + gr::thread::mutex *mutex() { return &d_mutex; } uint64_t nitems_written() { return d_abs_write_offset; } @@ -142,7 +142,7 @@ class GR_RUNTIME_API gr_buffer { // The mutex protects d_write_index, d_abs_write_offset, d_done, d_item_tags // and the d_read_index's and d_abs_read_offset's in the buffer readers. // - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; unsigned int d_write_index; // in items [0,d_bufsize) uint64_t d_abs_write_offset; // num items written since the start bool d_done; @@ -254,7 +254,7 @@ class GR_RUNTIME_API gr_buffer_reader { void set_done (bool done) { d_buffer->set_done (done); } bool done () const { return d_buffer->done (); } - gruel::mutex *mutex() { return d_buffer->mutex(); } + gr::thread::mutex *mutex() { return d_buffer->mutex(); } uint64_t nitems_read() { return d_abs_read_offset; } |