summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-02 14:40:18 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-02 15:54:58 +0200
commit2e6d82e94f3efc76ea4243bc67b3acbfc74d8b39 (patch)
tree2600788bdfaf8b40a814a6d88a676de3ab39cc94
parent2c1a55641b48380738ed58d3f24aa1f062da92db (diff)
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@redhat.com>
-rw-r--r--sw/source/core/doc/docbm.cxx4
1 files changed, 2 insertions, 2 deletions
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