diff options
| author | Andrew Morrow <acm@mongodb.com> | 2015-06-10 17:43:13 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2015-06-10 22:37:44 -0400 |
| commit | a9b6612f5322f916298c19a6728817a1034c6aab (patch) | |
| tree | 0da5b1ce36e6a8e2d85dbdeb49d505ac99bf6e1d /src/mongo/s/commands | |
| parent | 0ec1e625760eb9c1a20a3dba78200e8f9ff28d9e (diff) | |
| download | mongo-a9b6612f5322f916298c19a6728817a1034c6aab.tar.gz | |
SERVER-17309 Replace std::auto_ptr<T> with std::unique_ptr<T>
Diffstat (limited to 'src/mongo/s/commands')
| -rw-r--r-- | src/mongo/s/commands/cluster_find_cmd.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/s/commands/cluster_pipeline_cmd.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/s/commands/cluster_find_cmd.cpp b/src/mongo/s/commands/cluster_find_cmd.cpp index f92c486c6ee..648a1fe5256 100644 --- a/src/mongo/s/commands/cluster_find_cmd.cpp +++ b/src/mongo/s/commands/cluster_find_cmd.cpp @@ -36,7 +36,7 @@ namespace mongo { - using std::auto_ptr; + using std::unique_ptr; using std::string; using std::vector; @@ -97,7 +97,7 @@ namespace mongo { if (!lpqStatus.isOK()) { return lpqStatus; } - auto_ptr<LiteParsedQuery> lpq(rawLpq); + unique_ptr<LiteParsedQuery> lpq(rawLpq); BSONObjBuilder explainCmdBob; ClusterExplain::wrapAsExplain(cmdObj, verbosity, &explainCmdBob); diff --git a/src/mongo/s/commands/cluster_pipeline_cmd.cpp b/src/mongo/s/commands/cluster_pipeline_cmd.cpp index 201e7cfe5ed..a5b039797a7 100644 --- a/src/mongo/s/commands/cluster_pipeline_cmd.cpp +++ b/src/mongo/s/commands/cluster_pipeline_cmd.cpp @@ -387,12 +387,12 @@ namespace { "should only be running an aggregate command here", str::equals(cmd.firstElementFieldName(), "aggregate")); - scoped_ptr<DBClientCursor> cursor(conn->query(db + ".$cmd", - cmd, - -1, // nToReturn - 0, // nToSkip - NULL, // fieldsToReturn - queryOptions)); + auto cursor = conn->query(db + ".$cmd", + cmd, + -1, // nToReturn + 0, // nToSkip + NULL, // fieldsToReturn + queryOptions); massert(17014, str::stream() << "aggregate command didn't return results on host: " << conn->toString(), |