X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Gen.cxx;h=1e9c1471a1e404d52c46ef6385ab35fb437f9ca9;hb=00b30e0d6c8319e0579d59a8cd1d3ad01b83a271;hp=574d4b3dedba14709fe847a3806a3c72378678d1;hpb=8d297d6698f361d4f2dde723050bcfbaea050920;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 574d4b3de..1e9c1471a 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -93,12 +93,12 @@ namespace SMESH_Gen::~SMESH_Gen() { - std::map < int, SMESH_Hypothesis * >::iterator i_hyp = _studyContext->mapHypothesis.begin(); - for ( ; i_hyp != _studyContext->mapHypothesis.end(); ++i_hyp ) - { - if ( _Hyp* h = static_cast< _Hyp*>( i_hyp->second )) - h->NullifyGen(); - } + std::map < int, SMESH_Hypothesis * >::iterator i_hyp = _studyContext->mapHypothesis.begin(); + for ( ; i_hyp != _studyContext->mapHypothesis.end(); ++i_hyp ) + { + if ( _Hyp* h = static_cast< _Hyp*>( i_hyp->second )) + h->NullifyGen(); + } delete _studyContext->myDocument; delete _studyContext; } @@ -1032,13 +1032,13 @@ std::vector< std::string > SMESH_Gen::GetPluginXMLPaths() bool fileOK; #ifdef WIN32 #ifdef UNICODE - const wchar_t* path = Kernel_Utils::decode_s(xmlPath); + const wchar_t* path = Kernel_Utils::decode_s(xmlPath); #else - const char* path = xmlPath.c_str(); + const char* path = xmlPath.c_str(); #endif fileOK = (GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES); #ifdef UNICODE - delete path; + delete path; #endif #else fileOK = (access(xmlPath.c_str(), F_OK) == 0);