[Libreoffice-commits] online.git: loolwsd/Util.hpp

[Miklos Vajna]

 loolwsd/Util.hpp |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 55f18b4038d3448f7bba36b6b3942a69d617ee04
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Apr 19 09:35:36 2016 +0200

    loolwsd: fix -Werror=shadow

diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index 3b466cf..f2b0ffb 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -131,15 +131,15 @@ namespace Util
         {
         }
 
-        RegexListMatcher(std::initializer_list<std::string> allow) :
-            _allowed(allow)
+        RegexListMatcher(std::initializer_list<std::string> allowed) :
+            _allowed(allowed)
         {
         }
 
-        RegexListMatcher(std::initializer_list<std::string> allow,
-                         std::initializer_list<std::string> deny) :
-            _allowed(allow),
-            _denied(deny)
+        RegexListMatcher(std::initializer_list<std::string> allowed,
+                         std::initializer_list<std::string> denied) :
+            _allowed(allowed),
+            _denied(denied)
         {
         }
 
@@ -176,10 +176,10 @@ namespace Util
                 {
                     // Not performance critical to warrant caching.
                     Poco::RegularExpression re(value, Poco::RegularExpression::RE_CASELESS);
-                    Poco::RegularExpression::Match match;
+                    Poco::RegularExpression::Match reMatch;
 
                     // Must be a full match.
-                    if (re.match(subject, match) && match.offset == 0 && match.length == subject.size())
+                    if (re.match(subject, reMatch) && reMatch.offset == 0 && reMatch.length == subject.size())
                     {
                         return true;
                     }