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_block.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_block.h')
| -rw-r--r-- | gnuradio-runtime/include/gr_block.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/include/gr_block.h b/gnuradio-runtime/include/gr_block.h index a25bb4a528..77ca3f3f72 100644 --- a/gnuradio-runtime/include/gr_block.h +++ b/gnuradio-runtime/include/gr_block.h @@ -668,9 +668,9 @@ class GR_RUNTIME_API gr_block : public gr_basic_block { /*! Used by block's setters and work functions to make * setting/resetting of parameters thread-safe. * - * Used by calling gruel::scoped_lock l(d_setlock); + * Used by calling gr::thread::scoped_lock l(d_setlock); */ - gruel::mutex d_setlock; + gr::thread::mutex d_setlock; /*! Used by blocks to access the logger system. */ |