Fixed naming of a variable in `status_update_manager_process.hpp`. Rename the variable `_update` to `update_` to make the name consistent with the style guide.
Review: https://reviews.apache.org/r/64473/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e70097c5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e70097c5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e70097c5 Branch: refs/heads/master Commit: e70097c55bf63c23eedf3151047c40a1b698240e Parents: 3fa8d64 Author: Gaston Kleiman <[email protected]> Authored: Tue Dec 12 16:18:15 2017 -0800 Committer: Greg Mann <[email protected]> Committed: Tue Dec 12 16:55:47 2017 -0800 ---------------------------------------------------------------------- .../status_update_manager_process.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/e70097c5/src/status_update_manager/status_update_manager_process.hpp ---------------------------------------------------------------------- diff --git a/src/status_update_manager/status_update_manager_process.hpp b/src/status_update_manager/status_update_manager_process.hpp index a44551f..935f754 100644 --- a/src/status_update_manager/status_update_manager_process.hpp +++ b/src/status_update_manager/status_update_manager_process.hpp @@ -810,20 +810,20 @@ private: } // Get the corresponding update for this ACK. - const Result<UpdateType>& _update = next(); - if (_update.isError()) { - return Error(_update.error()); + const Result<UpdateType>& update_ = next(); + if (update_.isError()) { + return Error(update_.error()); } // This might happen if we retried a status update and got back // acknowledgments for both the original and the retried update. - if (_update.isNone()) { + if (update_.isNone()) { return Error( "Unexpected acknowledgment (UUID: " + statusUuid.toString() + ") for " + statusUpdateType + " stream " + stringify(streamId)); } - const UpdateType& update = _update.get(); + const UpdateType& update = update_.get(); if (acknowledged.contains(statusUuid)) { LOG(WARNING) << "Duplicate acknowledgment for " << statusUpdateType
