[Libreoffice-commits] online.git: loolwsd/test

[Miklos Vajna]

 loolwsd/test/httpwstest.cpp |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 9ea85e8d1aa306f28ae5cf3bc42e22bb17092b77
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Apr 25 09:22:41 2016 +0200

    httpwstest: fix -Werror,-Wshadow
    
    Change-Id: I64482d921409e291f6f60bf7d963a516ba4e7550

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 7716565..6c183be 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -962,10 +962,10 @@ void HTTPWSTest::testInsertDelete()
                 std::regex endLine("[^\n\r]+");
                 std::regex number("^[0-9]+$");
                 std::smatch match;
-                for (std::sregex_iterator it = std::sregex_iterator(response.begin(), response.end(), endLine);
-                     it != std::sregex_iterator(); ++it)
+                for (std::sregex_iterator regex_it = std::sregex_iterator(response.begin(), response.end(), endLine);
+                     regex_it != std::sregex_iterator(); ++regex_it)
                 {
-                    const auto str = (*it).str();
+                    const auto str = (*regex_it).str();
                     if (std::regex_match(str, match, number))
                     {
                         parts.push_back(match.str());
@@ -990,10 +990,10 @@ void HTTPWSTest::testInsertDelete()
                 std::regex endLine("[^\n\r]+");
                 std::regex number("^[0-9]+$");
                 std::smatch match;
-                for (std::sregex_iterator it = std::sregex_iterator(response.begin(), response.end(), endLine);
-                     it != std::sregex_iterator(); ++it)
+                for (std::sregex_iterator regex_it = std::sregex_iterator(response.begin(), response.end(), endLine);
+                     regex_it != std::sregex_iterator(); ++regex_it)
                 {
-                    const auto str = (*it).str();
+                    const auto str = (*regex_it).str();
                     if (std::regex_match(str, match, number))
                     {
                         parts.push_back(match.str());
@@ -1018,10 +1018,10 @@ void HTTPWSTest::testInsertDelete()
                 std::regex endLine("[^\n\r]+");
                 std::regex number("^[0-9]+$");
                 std::smatch match;
-                for (std::sregex_iterator it = std::sregex_iterator(response.begin(), response.end(), endLine);
-                     it != std::sregex_iterator(); ++it)
+                for (std::sregex_iterator regex_it = std::sregex_iterator(response.begin(), response.end(), endLine);
+                     regex_it != std::sregex_iterator(); ++regex_it)
                 {
-                    const auto str = (*it).str();
+                    const auto str = (*regex_it).str();
                     if (std::regex_match(str, match, number))
                     {
                         parts.push_back(match.str());
@@ -1046,10 +1046,10 @@ void HTTPWSTest::testInsertDelete()
                 std::regex endLine("[^\n\r]+");
                 std::regex number("^[0-9]+$");
                 std::smatch match;
-                for (std::sregex_iterator it = std::sregex_iterator(response.begin(), response.end(), endLine);
-                     it != std::sregex_iterator(); ++it)
+                for (std::sregex_iterator regex_it = std::sregex_iterator(response.begin(), response.end(), endLine);
+                     regex_it != std::sregex_iterator(); ++regex_it)
                 {
-                    const auto str = (*it).str();
+                    const auto str = (*regex_it).str();
                     if (std::regex_match(str, match, number))
                     {
                         parts.push_back(match.str());