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 8f6d66f1af3268d192f6e297204ff21d7e88b454..983aa064b924942baf611d12b3d1ccb642822683 100644 (file)
--- a/src/SMESHUtils/SMESH_Tree.hxx
+++ b/src/SMESHUtils/SMESH_Tree.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -85,7 +85,7 @@ class SMESH_Tree
 
   static int             nbChildren() { return NB_CHILDREN; }
 
-  // Compute the bigger dimension of my box
+  // Compute the biggest dimension of my box
   virtual double         maxSize() const = 0;
 
 protected:
@@ -115,14 +115,14 @@ protected:
   // 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;
 
-  box_type*      myBox;
+  // Build the children recursively
+  void                   buildChildren();
 };
 
 //===========================================================================
@@ -138,10 +138,10 @@ SMESH_Tree<BND_BOX,NB_CHILDREN>::SMESH_Tree (SMESH_TreeLimit* limit):
   myFather(0),
   myIsLeaf( false ),
   myLimit( limit ),
-  myLevel(0),
-  myBox(0)
+  myBox(0),
+  myLevel(0)
 {
-  if ( !myLimit ) myLimit = new SMESH_TreeLimit();
+  //if ( !myLimit ) myLimit = new SMESH_TreeLimit();
 }
 
 //================================================================================
@@ -155,6 +155,7 @@ void SMESH_Tree<BND_BOX,NB_CHILDREN>::compute()
 {
   if ( myLevel==0 )
   {
+    if ( !myLimit ) myLimit = new SMESH_TreeLimit();
     myBox = buildRootBox();
     if ( myLimit->myMinBoxSize > 0. && maxSize() <= myLimit->myMinBoxSize )
       myIsLeaf = true;
@@ -218,6 +219,8 @@ void SMESH_Tree<BND_BOX,NB_CHILDREN>::buildChildren()
     myChildren[i] = newChild();
     // and we assign to him its box.
     myChildren[i]->myFather = this;
+    if (myChildren[i]->myLimit)
+      delete myChildren[i]->myLimit;
     myChildren[i]->myLimit = myLimit;
     myChildren[i]->myLevel = myLevel + 1;
     myChildren[i]->myBox = newChildBox( i );