summaryrefslogtreecommitdiff
path: root/util/concurrency
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2010-11-17 23:38:11 -0500
committerEliot Horowitz <eliot@10gen.com>2010-11-17 23:38:11 -0500
commit4cbbaffeadbc8f98a36501dffaa7a7432da83567 (patch)
treea6cc272362cecdb8858ce79875a04c463221f034 /util/concurrency
parentc5f3c9d8def9680ea7f766c72b16d3f74112a61f (diff)
downloadmongo-4cbbaffeadbc8f98a36501dffaa7a7432da83567.tar.gz
compile
Diffstat (limited to 'util/concurrency')
-rw-r--r--util/concurrency/mutex.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/concurrency/mutex.h b/util/concurrency/mutex.h
index 112a9b9a7b3..8fe5e8b7c68 100644
--- a/util/concurrency/mutex.h
+++ b/util/concurrency/mutex.h
@@ -151,7 +151,7 @@ namespace mongo {
mutex(const char *)
#endif
{
- _m = new boost::mutex();
+ _m = new boost::timed_mutex();
IGNORE_OBJECT( _m ); // Turn-off heap checking on _m
}
~mutex() {
@@ -198,13 +198,13 @@ namespace mongo {
mutexDebugger.leaving(mut->_name);
#endif
}
- boost::mutex::scoped_lock &boost() { return _l; }
+ boost::timed_mutex::scoped_lock &boost() { return _l; }
private:
- boost::mutex::scoped_lock _l;
+ boost::timed_mutex::scoped_lock _l;
};
private:
- boost::mutex &boost() { return *_m; }
- boost::mutex *_m;
+ boost::timed_mutex &boost() { return *_m; }
+ boost::timed_mutex *_m;
};
typedef mutex::scoped_lock scoped_lock;