[Libreoffice-commits] core.git: sw/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 2 13:56:07 UTC 2019
sw/source/core/doc/docbm.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2e6d82e94f3efc76ea4243bc67b3acbfc74d8b39
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 2 14:40:18 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Oct 2 15:54:58 2019 +0200
Silence -Werror=redundant-move (GCC 10 trunk)
...after e8b74f5777440559fc9702a9bddd32b9428972a3 "-Werror,-Wreturn-std-move
(clang-cl)"
Change-Id: I0633612387e21eceeb64e677503614fa59285d3e
Reviewed-on: https://gerrit.libreoffice.org/80036
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 0d4e4d321863..6f2a38b0be5a 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -410,7 +410,7 @@ namespace
{
if(*ppCurrentMark == pMarkToFind)
{
- return std::move(ppCurrentMark);
+ return MarkManager::container_t::const_iterator(std::move(ppCurrentMark));
}
++ppCurrentMark;
}
@@ -437,7 +437,7 @@ namespace
break;
if(IDocumentMarkAccess::GetType(**ppCurrentMark) == eType)
{
- return std::move(ppCurrentMark);
+ return MarkManager::container_t::const_iterator(std::move(ppCurrentMark));
}
}
// reached a mark starting on a later start pos or the end of the
More information about the Libreoffice-commits
mailing list