common/StringVector.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c99664b19c52f7357367b1d8b626145312f44a24
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Mar 2 08:01:07 2020 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Mar 2 16:25:05 2020 +0100
StringVector: fix build with gcc-4.9
Debian 8 has gcc-4.9, which emits -Werror in case a parameter and a
member function has the same name. Given that we also use -Werror
unconditionally, this breaks the build. Newer gcc/clang versions relaxed
this warning, so this was not a problem in those cases.
Change-Id: I7ad09370d96aa7384b2c117dd8de421644898b50
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89785
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/common/StringVector.cpp b/common/StringVector.cpp
index 89777166b..4527e593e 100644
--- a/common/StringVector.cpp
+++ b/common/StringVector.cpp
@@ -59,17 +59,17 @@ std::string StringVector::getParam(const StringToken&
token) const
return _string.substr(token._index, token._length);
}
-std::string StringVector::cat(const std::string& separator, size_t begin) const
+std::string StringVector::cat(const std::string& separator, size_t offset)
const
{
std::string ret;
bool first = true;
- if (begin >= _tokens.size())
+ if (offset >= _tokens.size())
{
return ret;
}
- for (auto it = _tokens.begin() + begin; it != _tokens.end(); ++it)
+ for (auto it = _tokens.begin() + offset; it != _tokens.end(); ++it)
{
if (first)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
