Merge branch 'master' of github.com:mongodb/mongo

2010-05-25 22:03:07 -07:00
parent b9010af418 19d06f4138
commit 4a91c2c8b2
57 changed files with 297 additions and 217 deletions
--- a/util/assert_util.cpp
+++ b/util/assert_util.cpp
@@ -114,7 +114,7 @@ namespace mongo {
        throw UserException( code , ss.str() );
    }
    
-    mongo::mutex *Assertion::_mutex = new mongo::mutex();
+    mongo::mutex *Assertion::_mutex = new mongo::mutex("Assertion");

    string Assertion::toString() {
        if( _mutex == 0 )