summaryrefslogtreecommitdiff
path: root/src/mongo/db/client.h
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2015-02-19 10:25:09 -0500
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2015-02-20 17:09:57 -0500
commit9fa0565f2b45cf1faebf3cb62c6777b7373dee08 (patch)
tree770dd41e0324f189fb8f17fc232e78565a996d63 /src/mongo/db/client.h
parent3211addd3426161d7ee1f5cc8d191418a013018d (diff)
downloadmongo-9fa0565f2b45cf1faebf3cb62c6777b7373dee08.tar.gz
SERVER-17323 Instantiate storage engine before the Locker
Diffstat (limited to 'src/mongo/db/client.h')
-rw-r--r--src/mongo/db/client.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/client.h b/src/mongo/db/client.h
index 94a11fb3080..55beb82ef4c 100644
--- a/src/mongo/db/client.h
+++ b/src/mongo/db/client.h
@@ -203,7 +203,7 @@ namespace mongo {
OpTime getLastOp() const { return _lastOp; }
// Return a reference to the Locker for this client. Client retains ownership.
- Locker* getLocker() const { return _locker.get(); }
+ Locker* getLocker();
/* report what the last operation was. used by getlasterror */
void appendLastOp(BSONObjBuilder& b) const;
@@ -258,9 +258,9 @@ namespace mongo {
// Changes, based on what operation is running. Some of this should be in OperationContext.
CurOp* _curOp;
- // By having Client, rather than the OperationContext, own the Locker, setup cost such as
+ // By having Client, rather than the OperationContext, own the Locker, setup cost such as
// allocating OS resources can be amortized over multiple operations.
- boost::scoped_ptr<Locker> const _locker;
+ boost::scoped_ptr<Locker> _locker;
// Used by replication
OpTime _lastOp;