diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-07 03:18:02 -0500 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-07 03:18:02 -0500 |
| commit | 2be5c8ec24fce7884ce7975592615bd1aa4ee84b (patch) | |
| tree | 01355b821521cfcbb1d3e0424a9007d723dd878d /gruel | |
| parent | b6f0e19eec09066f16c6f4f91ae872985c0f34ba (diff) | |
| parent | 47c26f42b34856c5840724957868e842fdb6b857 (diff) | |
Merge branch 'master' into next
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 63143c8b46..c0b54b0a46 100644 --- a/gruel/src/include/gruel/thread.h +++ b/gruel/src/include/gruel/thread.h @@ -31,7 +31,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; } /* namespace gruel */ |