From: szy Date: Wed, 29 Jan 2014 14:26:10 +0000 (+0000) Subject: 29.01.2014. Workaround eliminating. X-Git-Tag: BR_hydro_v_1_0~28 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=13ef2433b28b41ed4d7338a31839a49c8b599ad7;p=modules%2Fhydro.git 29.01.2014. Workaround eliminating. --- diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx index 2205bc0b..b3cdc22e 100644 --- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx +++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx @@ -399,12 +399,12 @@ HYDROData_SplitToZonesTool::SplitDataList for(;expt.More();expt.Next()) { const TopoDS_Shape& anEdge = expt.Current(); if(!anEdge.IsNull()) { - const TopTools_ListOfShape& aListOfNewEd = mkCom.Modified(anEdge); - const TopTools_ListOfShape& aListOfGenEd = mkCom.Generated(anEdge); + const TopTools_ListOfShape& aListOfNewEd = mkCom.Modified(anEdge); if(!aListOfNewEd.IsEmpty()) aDM4.Bind(anEdge, aListOfNewEd); else { if(!mkCom.IsDeleted(anEdge)) { + const TopTools_ListOfShape& aListOfGenEd = mkCom.Generated(anEdge); if(!aListOfGenEd.IsEmpty()) { aDM4.Bind(anEdge, aListOfGenEd); } else { diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx index b058b8f3..8867c8ea 100644 --- a/src/HYDROData/HYDROData_Tool.cxx +++ b/src/HYDROData/HYDROData_Tool.cxx @@ -6,34 +6,19 @@ #include "HYDROData_Iterator.h" #include "HYDROData_NaturalObject.h" -#include -#include - #include #include #include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include #include #include #include -#include + static int aMaxNameId = std::numeric_limits::max(); void HYDROData_Tool::WriteStringsToFile( QFile& theFile,