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
Fix compilation errors using gcc-5.X relating to explicit stream::operator bool()
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_Tree.hxx
diff --git
a/src/SMESHUtils/SMESH_Tree.hxx
b/src/SMESHUtils/SMESH_Tree.hxx
index 36d4124209ca08835bd4148ca63c4383f9c7a932..983aa064b924942baf611d12b3d1ccb642822683 100644
(file)
--- a/
src/SMESHUtils/SMESH_Tree.hxx
+++ b/
src/SMESHUtils/SMESH_Tree.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-115,14
+115,14
@@
protected:
// Tree limit
const SMESH_TreeLimit* myLimit;
// Tree limit
const SMESH_TreeLimit* myLimit;
-private:
- // Build the children recursively
- void buildChildren();
+ // Bounding box of a tree
+ box_type* myBox;
// Level of the Tree
int myLevel;
// Level of the Tree
int myLevel;
- box_type* myBox;
+ // Build the children recursively
+ void buildChildren();
};
//===========================================================================
};
//===========================================================================
@@
-138,8
+138,8
@@
SMESH_Tree<BND_BOX,NB_CHILDREN>::SMESH_Tree (SMESH_TreeLimit* limit):
myFather(0),
myIsLeaf( false ),
myLimit( limit ),
myFather(0),
myIsLeaf( false ),
myLimit( limit ),
- my
Level
(0),
- my
Box
(0)
+ my
Box
(0),
+ my
Level
(0)
{
//if ( !myLimit ) myLimit = new SMESH_TreeLimit();
}
{
//if ( !myLimit ) myLimit = new SMESH_TreeLimit();
}