From 250c4f224450a7cbff5f30412f61ccfcc77c0e29 Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 26 Apr 2013 11:46:58 +0000 Subject: [PATCH] Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6 Fix the ensuring stability of SMESH_MeshEditor::makeWalls(). Allow storing both nodes and cells in one map sorted by ID. struct TIDCompare { bool operator () (const SMDS_MeshElement* e1, const SMDS_MeshElement* e2) const - { return e1->GetID() < e2->GetID(); } + { return e1->GetType() == e2->GetType() ? e1->GetID() < e2->GetID() : e1->GetType() < e2->GetType(); } --- src/SMDS/SMDS_MeshElement.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SMDS/SMDS_MeshElement.hxx b/src/SMDS/SMDS_MeshElement.hxx index 44d855622..ccb4373a9 100644 --- a/src/SMDS/SMDS_MeshElement.hxx +++ b/src/SMDS/SMDS_MeshElement.hxx @@ -198,7 +198,7 @@ protected: struct TIDCompare { bool operator () (const SMDS_MeshElement* e1, const SMDS_MeshElement* e2) const - { return e1->GetID() < e2->GetID(); } + { return e1->GetType() == e2->GetType() ? e1->GetID() < e2->GetID() : e1->GetType() < e2->GetType(); } }; #endif -- 2.39.2