Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' branch into 'V9_dev' branch.
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_IteratorOfElements.hxx
diff --git
a/src/SMDS/SMDS_IteratorOfElements.hxx
b/src/SMDS/SMDS_IteratorOfElements.hxx
index e0756198c9d2512d6635a3d3d786246cf30bf2ca..f2d73d8c797ccff285a0b154c2ee40b98fa41e5d 100644
(file)
--- a/
src/SMDS/SMDS_IteratorOfElements.hxx
+++ b/
src/SMDS/SMDS_IteratorOfElements.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMDS : implementaion of Salome mesh data structure
+// SMESH SMDS : implementa
t
ion of Salome mesh data structure
//
#include "SMESH_SMDS.hxx"
//
#include "SMESH_SMDS.hxx"
@@
-43,11
+43,11
@@
class SMDS_EXPORT SMDS_IteratorOfElements:public SMDS_ElemIterator
const SMDS_MeshElement * next();
private:
const SMDS_MeshElement * next();
private:
- SMDS_ElemIteratorPtr t2Iterator;
SMDS_ElemIteratorPtr t1Iterator;
SMDS_ElemIteratorPtr t1Iterator;
+ SMDS_ElemIteratorPtr t2Iterator;
SMDSAbs_ElementType myType;
SMDSAbs_ElementType myType;
- const SMDS_MeshElement * myProxyElement;
const SMDS_MeshElement * myElement;
const SMDS_MeshElement * myElement;
+ const SMDS_MeshElement * myProxyElement;
bool myReverseIteration;
std::set<const SMDS_MeshElement*> alreadyReturnedElements;
bool myReverseIteration;
std::set<const SMDS_MeshElement*> alreadyReturnedElements;