From d05ae183409163b23e9157570e185d6600541aa3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 7 Sep 2019 15:19:28 +0200 Subject: [PATCH] fix -Wreturn-std-move --- .../salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp | 4 ++-- src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp | 2 +- src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp | 2 +- src/Gui/ViewProviderPythonFeature.cpp | 2 +- src/Mod/Part/App/FaceMakerCheese.cpp | 2 +- src/Mod/Part/App/TopoShape.cpp | 8 ++++---- src/Mod/Part/Gui/DlgProjectionOnSurface.cpp | 2 +- src/Mod/Path/App/Area.cpp | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp index a6605f36bc..d507e41d87 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp @@ -2350,7 +2350,7 @@ namespace << ": " << ex.DynamicType()->Name(); if ( ex.GetMessageString() && strlen( ex.GetMessageString() )) str << ": " << ex.GetMessageString(); - return str; + return std::move(str); } //================================================================================ /*! @@ -2364,7 +2364,7 @@ namespace if ( strlen( netgen::multithread.task ) > 0 ) str << " at " << netgen::multithread.task; str << ": " << ex.What(); - return str; + return std::move(str); } //================================================================================ diff --git a/src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp b/src/3rdParty/salomesmesh/src/SMESH/GEOMUtils.cpp index 87a0c2cf0c..2e80ead8bd 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 aCompound; + return std::move(aCompound); } //======================================================================= diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_subMesh.cpp index 9424d6df21..2179e8c829 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 aCompound; + return std::move(aCompound); } //======================================================================= diff --git a/src/Gui/ViewProviderPythonFeature.cpp b/src/Gui/ViewProviderPythonFeature.cpp index adc63fcea9..89446563fd 100644 --- a/src/Gui/ViewProviderPythonFeature.cpp +++ b/src/Gui/ViewProviderPythonFeature.cpp @@ -374,7 +374,7 @@ QIcon ViewProviderPythonFeatureImp::getIcon() const std::vector ViewProviderPythonFeatureImp::claimChildren(std::vector&& base) const { - _FC_PY_CALL_CHECK(claimChildren,return(base)); + _FC_PY_CALL_CHECK(claimChildren,return (std::move(base))); std::vector children; Base::PyGILStateLocker lock; diff --git a/src/Mod/Part/App/FaceMakerCheese.cpp b/src/Mod/Part/App/FaceMakerCheese.cpp index a52ffc2939..180d8470f1 100644 --- a/src/Mod/Part/App/FaceMakerCheese.cpp +++ b/src/Mod/Part/App/FaceMakerCheese.cpp @@ -236,7 +236,7 @@ TopoDS_Shape FaceMakerCheese::makeFace(const std::vector& w) builder.Add(comp, aFace); } - return comp; + return std::move(comp); } else { return TopoDS_Shape(); // error diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 4f95355160..ce6749ebbd 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -2226,7 +2226,7 @@ TopoDS_Shape TopoShape::makeHelix(Standard_Real pitch, Standard_Real height, TopoDS_Edge edgeOnSurf = BRepBuilderAPI_MakeEdge(segm , surf); TopoDS_Wire wire = BRepBuilderAPI_MakeWire(edgeOnSurf); BRepLib::BuildCurves3d(wire); - return wire; + return std::move(wire); } //*********** @@ -2312,7 +2312,7 @@ TopoDS_Shape TopoShape::makeLongHelix(Standard_Real pitch, Standard_Real height, TopoDS_Wire wire = mkWire.Wire(); BRepLib::BuildCurves3d(wire); - return wire; + return std::move(wire); } TopoDS_Shape TopoShape::makeThread(Standard_Real pitch, @@ -2932,7 +2932,7 @@ TopoDS_Shape TopoShape::makeOffset2D(double offset, short joinType, bool fill, b builder.MakeCompound(result); for(TopoDS_Shape &sh : shapesToReturn) builder.Add(result, sh); - return result; + return std::move(result); } else { return shapesToReturn[0]; @@ -3179,7 +3179,7 @@ TopoDS_Shape TopoShape::removeSplitter() const builder.Add(comp, xp.Current()); } - return comp; + return std::move(comp); } return _Shape; diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp index ad0d94011a..4719ea65e8 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp @@ -542,7 +542,7 @@ TopoDS_Shape PartGui::DlgProjectionOnSurface::create_compound(const std::vector< } } } - return aCompound; + return std::move(aCompound); } void PartGui::DlgProjectionOnSurface::show_projected_shapes(const std::vector& iShapeStoreVec) diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index 543d31c671..1b0f51cbda 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -1730,7 +1730,7 @@ TopoDS_Shape Area::toShape(CArea &area, short fill, int reorient) { builder.Add(compound,s);\ }\ if(TopExp_Explorer(compound,TopAbs_EDGE).More())\ - return compound;\ + return std::move(compound);\ return TopoDS_Shape();\ }\ return mySections[_index]->_op(_index, ## __VA_ARGS__);\ @@ -1868,7 +1868,7 @@ TopoDS_Shape Area::makeOffset(int index,PARAM_ARGS(PARAM_FARG,AREA_PARAMS_OFFSET if(thicken) FC_DURATION_LOG(d,"Thicken"); if(TopExp_Explorer(compound,TopAbs_EDGE).More()) - return compound; + return std::move(compound); return TopoDS_Shape(); } @@ -2255,7 +2255,7 @@ TopoDS_Shape Area::toShape(const CArea &area, bool fill, const gp_Trsf *trsf, in AREA_WARN("FaceMakerBullseye failed: "<