summaryrefslogtreecommitdiff
path: root/src/mongo/db/commands/current_op.cpp
diff options
context:
space:
mode:
authorMaria van Keulen <maria@mongodb.com>2017-05-01 14:34:14 -0400
committerMaria van Keulen <maria@mongodb.com>2017-05-04 16:14:37 -0400
commit67b8dfc2beb283b08f2549df4d99730325ee5de2 (patch)
tree0d6ee895c94f6402318f35ce6d930075fd62e260 /src/mongo/db/commands/current_op.cpp
parent9075734cd9ab2a4caafbec75b22d2c4b11b7ba36 (diff)
downloadmongo-67b8dfc2beb283b08f2549df4d99730325ee5de2.tar.gz
SERVER-28907 Fix hidden argument warnings caused by opCtx rename
This commit resolves variable name conflicts introduced by the txn to opCtx rename in commit 589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79.
Diffstat (limited to 'src/mongo/db/commands/current_op.cpp')
-rw-r--r--src/mongo/db/commands/current_op.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/db/commands/current_op.cpp b/src/mongo/db/commands/current_op.cpp
index 0467e69b81a..fd69d1c06a9 100644
--- a/src/mongo/db/commands/current_op.cpp
+++ b/src/mongo/db/commands/current_op.cpp
@@ -130,11 +130,11 @@ public:
continue;
}
- const OperationContext* opCtx = client->getOperationContext();
+ const OperationContext* clientOpCtx = client->getOperationContext();
if (!includeAll) {
// Skip over inactive connections.
- if (!opCtx)
+ if (!clientOpCtx)
continue;
}
@@ -153,18 +153,18 @@ public:
}
// Operation context specific information
- infoBuilder.appendBool("active", static_cast<bool>(opCtx));
- if (opCtx) {
- infoBuilder.append("opid", opCtx->getOpID());
- if (opCtx->isKillPending()) {
+ infoBuilder.appendBool("active", static_cast<bool>(clientOpCtx));
+ if (clientOpCtx) {
+ infoBuilder.append("opid", clientOpCtx->getOpID());
+ if (clientOpCtx->isKillPending()) {
infoBuilder.append("killPending", true);
}
- CurOp::get(opCtx)->reportState(&infoBuilder);
+ CurOp::get(clientOpCtx)->reportState(&infoBuilder);
// LockState
Locker::LockerInfo lockerInfo;
- opCtx->lockState()->getLockerInfo(&lockerInfo);
+ clientOpCtx->lockState()->getLockerInfo(&lockerInfo);
fillLockerInfo(lockerInfo, infoBuilder);
}