diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-07 02:51:18 -0500 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-07 02:51:18 -0500 |
| commit | 47c26f42b34856c5840724957868e842fdb6b857 (patch) | |
| tree | 32a35a9751a5daf2c465f49104f5337ce3eeffa3 /gruel | |
| parent | bb156c4879fadecbe9ab45085736c1b52552efe6 (diff) | |
| parent | 4a9b54a2b860c445401523a4c2fc3be5da8b3afc (diff) | |
Merge branch 'maint'
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 */ |