diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-07 11:08:53 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-07 11:08:53 -0500 |
| commit | 23e56ce76921dc6aafd868dac421023646641925 (patch) | |
| tree | b5c259b4de7ed0f864c29cbee2aad557b5aaa0e9 /gruel | |
| parent | e532342c4b67b10f180f4da5b5ab6c89ea3179f0 (diff) | |
| parent | ce7d46835eef941dad82edbfe9b353925d3d3954 (diff) | |
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gruel')
| -rw-r--r-- | gruel/src/include/gruel/thread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gruel/src/include/gruel/thread.h b/gruel/src/include/gruel/thread.h index 2172e90d3b..60832675cd 100644 --- a/gruel/src/include/gruel/thread.h +++ b/gruel/src/include/gruel/thread.h @@ -42,7 +42,7 @@ namespace gruel { typedef boost::thread thread; typedef boost::mutex mutex; - typedef boost::mutex::scoped_lock scoped_lock; + typedef boost::unique_lock<boost::mutex> scoped_lock; typedef boost::condition_variable condition_variable; /*! \brief a system-dependent typedef for the underlying thread type. |