From 449edf9854f68a6d889cbd8b65bdcff3e4bcc86d Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 12 Jun 2020 13:32:59 +0200 Subject: [PATCH] C++: [skip ci] fix -Wredundant-move This change was part of #2720 but has been skipped in order to not complicate a pending PR of an upgrade of the SMESH sources. However, this other PR #2706 has been closed by its author. Since this warning is reported on latest Fedora version using gcc 10 it will be fixed now. --- src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp | 2 +- src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp b/src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp index 2e80ead8bd..7ceb61e03f 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp @@ -643,7 +643,7 @@ TopoDS_Shape GEOMUtils::CompsolidToCompound (const TopoDS_Shape& theCompsolid) } } - return std::move(aCompound); + return TopoDS_Shape(std::move(aCompound)); } //======================================================================= diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp index 2179e8c829..12e6d23c5c 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp @@ -2100,7 +2100,7 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen, } } - return std::move(aCompound); + return TopoDS_Compound(std::move(aCompound)); } //=======================================================================