diff options
author | Spencer T Brody <spencer@mongodb.com> | 2015-05-29 18:13:48 -0400 |
---|---|---|
committer | Spencer T Brody <spencer@mongodb.com> | 2015-05-29 18:13:48 -0400 |
commit | e181ea38af737ef7aaf5f8228f870d8c7149b2bb (patch) | |
tree | 5c340753a9315e29b0c4b738c262eee7f538df64 /src/mongo/db/service_context_noop.cpp | |
parent | c6a542c1e69e0027c7a10f865cfa7767d5ed089d (diff) | |
download | mongo-e181ea38af737ef7aaf5f8228f870d8c7149b2bb.tar.gz |
Revert "SERVER-14995 Move operation id, lockState and client fields to OperationContext."
This reverts commit 4ea38c308da292f43e29d32b1b53b7324db0bafe.
Diffstat (limited to 'src/mongo/db/service_context_noop.cpp')
-rw-r--r-- | src/mongo/db/service_context_noop.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/service_context_noop.cpp b/src/mongo/db/service_context_noop.cpp index 87bff0c7932..47c3efe8797 100644 --- a/src/mongo/db/service_context_noop.cpp +++ b/src/mongo/db/service_context_noop.cpp @@ -32,7 +32,6 @@ #include "mongo/db/operation_context_noop.h" #include "mongo/db/op_observer.h" -#include "mongo/stdx/memory.h" namespace mongo { @@ -82,8 +81,8 @@ namespace mongo { void ServiceContextNoop::registerKillOpListener(KillOpListenerInterface* listener) { } - std::unique_ptr<OperationContext> ServiceContextNoop::newOpCtx() { - return stdx::make_unique<OperationContextNoop>(); + OperationContext* ServiceContextNoop::newOpCtx() { + return new OperationContextNoop(); } void ServiceContextNoop::setOpObserver(std::unique_ptr<OpObserver> opObserver) { |