From 27aae352dcc0a95baf12f0bfc84283b1bd77410a Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 20 Mar 2008 08:49:14 +0000 Subject: [PATCH] *** empty log message *** --- src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 64 +++++++++++----------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx index e500ed3ad..b19cea4d0 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx @@ -52,7 +52,7 @@ using namespace MED; void DriverMED_R_SMESHDS_Mesh -::SetMeshName(string theMeshName) +::SetMeshName(std::string theMeshName) { myMeshName = theMeshName; } @@ -61,7 +61,7 @@ static const SMDS_MeshNode* FindNode(const SMDS_Mesh* theMesh, TInt theId){ const SMDS_MeshNode* aNode = theMesh->FindNode(theId); if(aNode) return aNode; - EXCEPTION(runtime_error,"SMDS_Mesh::FindNode - cannot find a SMDS_MeshNode for ID = "<GetGroupName(iGr); + std::string aGroupName = aFamilyInfo->GetGroupName(iGr); if(MYDEBUG) MESSAGE(aGroupName); aFamily->AddGroupName(aGroupName); } @@ -348,7 +348,7 @@ DriverMED_R_SMESHDS_Mesh case ePOINT1: aNbNodes = 1; break; default:; } - vector aNodeIds(aNbNodes); + std::vector aNodeIds(aNbNodes); bool anIsValidConnect = false; TCConnSlice aConnSlice = aCellInfo->GetConnSlice(iElem); #ifndef _DEXCEPT_ @@ -721,9 +721,9 @@ DriverMED_R_SMESHDS_Mesh return aResult; } -list DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus) +std::list DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus) { - list aMeshNames; + std::list aMeshNames; try { if(MYDEBUG) MESSAGE("GetMeshNames - myFile : " << myFile); @@ -749,17 +749,17 @@ list DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus) return aMeshNames; } -list DriverMED_R_SMESHDS_Mesh::GetGroupNamesAndTypes() +std::list DriverMED_R_SMESHDS_Mesh::GetGroupNamesAndTypes() { - list aResult; - set aResGroupNames; + std::list aResult; + std::set aResGroupNames; - map::iterator aFamsIter = myFamilies.begin(); + std::map::iterator aFamsIter = myFamilies.begin(); for (; aFamsIter != myFamilies.end(); aFamsIter++) { DriverMED_FamilyPtr aFamily = (*aFamsIter).second; const MED::TStringSet& aGroupNames = aFamily->GetGroupNames(); - set::const_iterator aGrNamesIter = aGroupNames.begin(); + std::set::const_iterator aGrNamesIter = aGroupNames.begin(); for (; aGrNamesIter != aGroupNames.end(); aGrNamesIter++) { TNameAndType aNameAndType = make_pair( *aGrNamesIter, aFamily->GetType() ); @@ -777,17 +777,17 @@ list DriverMED_R_SMESHDS_Mesh::GetGroupNamesAndTypes() void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup) { - string aGroupName (theGroup->GetStoreName()); + std::string aGroupName (theGroup->GetStoreName()); if(MYDEBUG) MESSAGE("Get Group " << aGroupName); - map::iterator aFamsIter = myFamilies.begin(); + std::map::iterator aFamsIter = myFamilies.begin(); for (; aFamsIter != myFamilies.end(); aFamsIter++) { DriverMED_FamilyPtr aFamily = (*aFamsIter).second; if (aFamily->GetType() == theGroup->GetType() && aFamily->MemberOf(aGroupName)) { - const set& anElements = aFamily->GetElements(); - set::const_iterator anElemsIter = anElements.begin(); + const std::set& anElements = aFamily->GetElements(); + std::set::const_iterator anElemsIter = anElements.begin(); const SMDS_MeshElement * element = 0; for (; anElemsIter != anElements.end(); anElemsIter++) { @@ -805,15 +805,15 @@ void DriverMED_R_SMESHDS_Mesh::GetSubMesh (SMESHDS_SubMesh* theSubMesh, { char submeshGrpName[ 30 ]; sprintf( submeshGrpName, "SubMesh %d", theId ); - string aName (submeshGrpName); - map::iterator aFamsIter = myFamilies.begin(); + std::string aName (submeshGrpName); + std::map::iterator aFamsIter = myFamilies.begin(); for (; aFamsIter != myFamilies.end(); aFamsIter++) { DriverMED_FamilyPtr aFamily = (*aFamsIter).second; if (aFamily->MemberOf(aName)) { - const set& anElements = aFamily->GetElements(); - set::const_iterator anElemsIter = anElements.begin(); + const std::set& anElements = aFamily->GetElements(); + std::set::const_iterator anElemsIter = anElements.begin(); if (aFamily->GetType() == SMDSAbs_Node) { for (; anElemsIter != anElements.end(); anElemsIter++) @@ -835,21 +835,21 @@ void DriverMED_R_SMESHDS_Mesh::GetSubMesh (SMESHDS_SubMesh* theSubMesh, void DriverMED_R_SMESHDS_Mesh::CreateAllSubMeshes () { - map::iterator aFamsIter = myFamilies.begin(); + std::map::iterator aFamsIter = myFamilies.begin(); for (; aFamsIter != myFamilies.end(); aFamsIter++) { DriverMED_FamilyPtr aFamily = (*aFamsIter).second; MED::TStringSet aGroupNames = aFamily->GetGroupNames(); - set::iterator aGrNamesIter = aGroupNames.begin(); + std::set::iterator aGrNamesIter = aGroupNames.begin(); for (; aGrNamesIter != aGroupNames.end(); aGrNamesIter++) { - string aName = *aGrNamesIter; + std::string aName = *aGrNamesIter; // Check, if this is a Group or SubMesh name - if (aName.substr(0, 7) == string("SubMesh")) + if (aName.substr(0, 7) == std::string("SubMesh")) { - int Id = atoi(string(aName).substr(7).c_str()); - set anElements = aFamily->GetElements(); - set::iterator anElemsIter = anElements.begin(); + int Id = atoi(std::string(aName).substr(7).c_str()); + std::set anElements = aFamily->GetElements(); + std::set::iterator anElemsIter = anElements.begin(); if (aFamily->GetType() == SMDSAbs_Node) { for (; anElemsIter != anElements.end(); anElemsIter++) @@ -891,7 +891,7 @@ void DriverMED_R_SMESHDS_Mesh::CreateAllSubMeshes () bool DriverMED_R_SMESHDS_Mesh::checkFamilyID(DriverMED_FamilyPtr & aFamily, int anID) const { if ( !aFamily || aFamily->GetId() != anID ) { - map::const_iterator i_fam = myFamilies.find(anID); + std::map::const_iterator i_fam = myFamilies.find(anID); if ( i_fam == myFamilies.end() ) return false; aFamily = i_fam->second; @@ -942,7 +942,7 @@ bool DriverMED_R_SMESHDS_Mesh::buildMeshGrille(const MED::PWrapper& theWrapper, case MED::eSEG2: if(aNodeIds.size() != 2){ res = false; - EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 2!="<