From 116d93dbbcdc52b7d4d8bdc6b6652d23cb61b23b Mon Sep 17 00:00:00 2001 From: Michael Lee Date: Wed, 10 Feb 2016 20:22:20 -0800 Subject: [PATCH] fix -Wshadowing in String.cpp Summary: Didn't check this with -Wshadow when I first wrote it. Reviewed By: ranjeeth Differential Revision: D2926047 fb-gh-sync-id: 8391986dee2d6b5698491bd2995f039468ec684d shipit-source-id: 8391986dee2d6b5698491bd2995f039468ec684d --- folly/String.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/folly/String.cpp b/folly/String.cpp index 6692c783..43404026 100644 --- a/folly/String.cpp +++ b/folly/String.cpp @@ -571,7 +571,7 @@ std::string stripLeftMargin(std::string s) { const auto sentinel = std::numeric_limits::max(); auto indent = sentinel; size_t max_length = 0; - for (auto piece = piecer.begin(); piece != piecer.end(); piece++) { + for (piece = piecer.begin(); piece != piecer.end(); piece++) { needle = std::find_if(piece->begin(), piece->end(), [](char c) { return c != ' ' && c != '\t'; }); @@ -582,11 +582,11 @@ std::string stripLeftMargin(std::string s) { } } indent = indent == sentinel ? max_length : indent; - for (auto& piece : piecer) { - if (piece.size() < indent) { - piece.clear(); + for (piece = piecer.begin(); piece != piecer.end(); piece++) { + if (piece->size() < indent) { + piece->clear(); } else { - piece.erase(piece.begin(), piece.begin() + indent); + piece->erase(piece->begin(), piece->begin() + indent); } } return join("\n", piecer); -- 2.34.1