summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Pasette <dan@10gen.com>2013-04-02 12:06:20 -0400
committerDan Pasette <dan@10gen.com>2013-04-02 13:20:05 -0400
commit81212176da8a2b0e3791f0644b562eb66c000219 (patch)
treea7c92aaa7edee532afded2d7bbd2cbe918e56ee7
parent822840b180533efc07fc5eea660e929edc6f6c9f (diff)
downloadmongo-81212176da8a2b0e3791f0644b562eb66c000219.tar.gz
SERVER-7271 - Fix compile error with ScopedDbConnection
-rw-r--r--src/mongo/client/distlock.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mongo/client/distlock.cpp b/src/mongo/client/distlock.cpp
index 98163fe94aa..7a6efbc1b05 100644
--- a/src/mongo/client/distlock.cpp
+++ b/src/mongo/client/distlock.cpp
@@ -494,7 +494,9 @@ namespace mongo {
bool DistributedLock::isLockHeld( double timeout, string* errMsg ) {
- ScopedDbConnection conn(_conn.toString(), timeout );
+ scoped_ptr<ScopedDbConnection> connPtr(
+ ScopedDbConnection::getInternalScopedDbConnection( _conn.toString(), timeout ) );
+ ScopedDbConnection& conn = *connPtr;
BSONObj lockObj;
try {
@@ -564,7 +566,9 @@ namespace mongo {
if ( other == NULL )
other = &dummyOther;
- ScopedDbConnection conn(_conn.toString(), timeout );
+ scoped_ptr<ScopedDbConnection> connPtr(
+ ScopedDbConnection::getInternalScopedDbConnection( _conn.toString(), timeout ) );
+ ScopedDbConnection& conn = *connPtr;
BSONObjBuilder queryBuilder;
queryBuilder.append( LocksType::name() , _name );