X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers_I%2FStdMeshers_ImportSource1D_i.cxx;h=61ec24bd4affaa6d55f584d40b11ce8905359884;hp=e86a81e0305f26124c8d265951f5de2bb84d229e;hb=30ce546b0c5099ad1112929e2db94810e683e54b;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce diff --git a/src/StdMeshers_I/StdMeshers_ImportSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ImportSource1D_i.cxx index e86a81e03..61ec24bd4 100644 --- a/src/StdMeshers_I/StdMeshers_ImportSource1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ImportSource1D_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -56,7 +56,6 @@ StdMeshers_ImportSource1D_i::StdMeshers_ImportSource1D_i( PortableServer::POA_pt : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_ImportSource1D_i::StdMeshers_ImportSource1D_i" ); myBaseImpl = new ::StdMeshers_ImportSource1D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -73,7 +72,6 @@ StdMeshers_ImportSource1D_i::StdMeshers_ImportSource1D_i( PortableServer::POA_pt StdMeshers_ImportSource1D_i::~StdMeshers_ImportSource1D_i() { - MESSAGE( "StdMeshers_ImportSource1D_i::~StdMeshers_ImportSource1D_i" ); } //============================================================================= @@ -84,14 +82,13 @@ StdMeshers_ImportSource1D_i::~StdMeshers_ImportSource1D_i() void StdMeshers_ImportSource1D_i::SetSourceEdges(const SMESH::ListOfGroups& groups) { - MESSAGE( "StdMeshers_ImportSource1D_i::SetSourceEdges" ); ASSERT( myBaseImpl ); try { std::vector smesh_groups; std::vector entries; SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy(); - for ( int i = 0; i < groups.length(); ++i ) + for ( CORBA::ULong i = 0; i < groups.length(); ++i ) if ( SMESH_GroupBase_i* gp_i = SMESH::DownCast( groups[i] )) { if ( gp_i->GetType() != SMESH::EDGE ) @@ -109,7 +106,7 @@ void StdMeshers_ImportSource1D_i::SetSourceEdges(const SMESH::ListOfGroups& grou _groupEntries = new SMESH::string_array; _groupEntries->length( entries.size ()); - for ( int i = 0; i < entries.size(); ++i ) + for ( size_t i = 0; i < entries.size(); ++i ) _groupEntries[i] = entries[i].c_str(); } catch ( SALOME_Exception& S_ex ) @@ -129,7 +126,6 @@ void StdMeshers_ImportSource1D_i::SetSourceEdges(const SMESH::ListOfGroups& grou SMESH::string_array* StdMeshers_ImportSource1D_i::GetSourceEdges() { - MESSAGE( "StdMeshers_ImportSource1D_i::GetImportSource" ); SMESH::string_array_var res = new SMESH::string_array( _groupEntries ); return res._retn(); } @@ -173,7 +169,7 @@ char* StdMeshers_ImportSource1D_i::SaveTo() os << " " << _groupEntries->length(); SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy(); - for ( int i = 0; i < _groupEntries->length(); ++i ) + for ( size_t i = 0; i < _groupEntries->length(); ++i ) { // entry os << " " << _groupEntries[i]; @@ -208,7 +204,7 @@ void StdMeshers_ImportSource1D_i::LoadFrom( const char* theStream ) _groupEntries = new SMESH::string_array; _groupEntries->length( nbGroups ); std::string id, entry; - for ( int i = 0; i < _groupEntries->length(); ++i ) + for ( size_t i = 0; i < _groupEntries->length(); ++i ) { if ( is >> entry ) _groupEntries[i] = entry.c_str(); @@ -261,7 +257,6 @@ void StdMeshers_ImportSource1D_i::UpdateAsMeshesRestored() ::StdMeshers_ImportSource1D* StdMeshers_ImportSource1D_i::GetImpl() { - MESSAGE( "StdMeshers_ImportSource1D_i::GetImpl" ); return ( ::StdMeshers_ImportSource1D* )myBaseImpl; }