loolwsd/Util.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 01c6cb40ef3c4718b8074288e790b47b545fefbe Author: Miklos Vajna <[email protected]> Date: Tue Sep 27 09:48:06 2016 +0200 Util: fix -Werror=shadow gcc-4.8 still doesn't allow using the same name for a member function and a local variable. Change-Id: I9c327331b5c3460ec0e6d986a0543b17ba92c7ac diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp index f038005..fb1bd43 100644 --- a/loolwsd/Util.hpp +++ b/loolwsd/Util.hpp @@ -180,11 +180,11 @@ namespace Util { // Not performance critical to warrant caching. std::regex re(value, std::regex::icase); - std::smatch match; + std::smatch smatch; // Must be a full match. - if (std::regex_match(subject, match, re) && - match.position() == 0 && match.length() == length) + if (std::regex_match(subject, smatch, re) && + smatch.position() == 0 && smatch.length() == length) { return true; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
