diff options
| author | Scott Hernandez <scotthernandez@gmail.com> | 2014-12-22 17:32:27 -0500 |
|---|---|---|
| committer | Scott Hernandez <scotthernandez@gmail.com> | 2015-01-02 14:21:08 -0500 |
| commit | 8384c878b542352ba88ecade1e675b8412f2655f (patch) | |
| tree | a9b40ee6ec4fb837b99a2d3a9e37b6ece12a650c /src/mongo/db/commands/mr.cpp | |
| parent | 8b37507dd51cdf058377a24ca0171e7fae6f2c6b (diff) | |
| download | mongo-8384c878b542352ba88ecade1e675b8412f2655f.tar.gz | |
SERVER-16502: make getCollection const and not require an OpContext
Diffstat (limited to 'src/mongo/db/commands/mr.cpp')
| -rw-r--r-- | src/mongo/db/commands/mr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp index c06fbfb252e..f062a239f91 100644 --- a/src/mongo/db/commands/mr.cpp +++ b/src/mongo/db/commands/mr.cpp @@ -630,7 +630,7 @@ namespace mongo { { Client::Context tx(txn, _config.outputOptions.finalNamespace); Collection* coll = - tx.db()->getCollection(_txn, _config.outputOptions.finalNamespace); + tx.db()->getCollection(_config.outputOptions.finalNamespace); found = Helpers::findOne(_txn, coll, temp["_id"].wrap(), @@ -892,7 +892,7 @@ namespace mongo { } Collection* State::getCollectionOrUassert(Database* db, const StringData& ns) { - Collection* out = db ? db->getCollection(_txn, ns) : NULL; + Collection* out = db ? db->getCollection(ns) : NULL; uassert(18697, "Collection unexpectedly disappeared: " + ns.toString(), out); return out; |