loolwsd/LOOLWSD.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c7bef135c5c1ad205105a511e8c5d3a4657d789f
Author: Henry Castro <hcas...@collabora.com>
Date: Sat Aug 13 08:59:14 2016 -0400
loolwsd: fix -Werror=shadow
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 6d1affd..58d5853 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1371,11 +1371,11 @@ void LOOLWSD::initialize(Application& self)
for (size_t i = 0; ; ++i)
{
const std::string confPath = "logging.file.property[" +
std::to_string(i) + "]";
- const auto name = config().getString(confPath + "[@name]", "");
- if (!name.empty())
+ const auto confName = config().getString(confPath + "[@name]", "");
+ if (!confName.empty())
{
const auto value = config().getString(confPath, "");
- logProperties.emplace(name, value);
+ logProperties.emplace(confName, value);
}
else if (!config().has(confPath))
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
