X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_HypoFilter.hxx;h=e971dfae4bb03aaada6da646bea8a7e2b94b3f19;hb=8972ce9d8445b6f859176d894c22b62499bf5616;hp=7bcbe813c3f522770d1cfea1a9c0cc48a94f9c8c;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git

diff --git a/src/SMESH/SMESH_HypoFilter.hxx b/src/SMESH/SMESH_HypoFilter.hxx
index 7bcbe813c..e971dfae4 100644
--- a/src/SMESH/SMESH_HypoFilter.hxx
+++ b/src/SMESH/SMESH_HypoFilter.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
@@ -59,9 +59,9 @@ class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
   // Create and add predicates.
   // Added predicates will be destroyed by filter when it dies
   SMESH_HypoFilter();
-  SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNagate = true );
-  // notNagate==false means !aPredicate->IsOk()
-  SMESH_HypoFilter & Init  ( SMESH_HypoPredicate* aPredicate, bool notNagate = true );
+  explicit SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNegate = true );
+  // notNegate==false means !aPredicate->IsOk()
+  SMESH_HypoFilter & Init  ( SMESH_HypoPredicate* aPredicate, bool notNegate = true );
   SMESH_HypoFilter & And   ( SMESH_HypoPredicate* aPredicate );
   SMESH_HypoFilter & AndNot( SMESH_HypoPredicate* aPredicate );
   SMESH_HypoFilter & Or    ( SMESH_HypoPredicate* aPredicate );
@@ -80,7 +80,7 @@ class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
   static SMESH_HypoPredicate* HasDim(const int theDim);
   static SMESH_HypoPredicate* HasType(const int theHypType);
 
-  bool IsEmpty() const { return myPredicates.empty(); }
+  bool IsEmpty() const { return myNbPredicates == 0; }
 
   /*!
    * \brief check aHyp or/and aShape it is assigned to
@@ -90,7 +90,7 @@ class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
   /*!
    * \brief return true if contains no predicates
    */
-  bool IsAny() const { return myPredicates.empty(); }
+  bool IsAny() const { return myNbPredicates > 0; }
 
   ~SMESH_HypoFilter();
 
@@ -98,7 +98,9 @@ class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
  protected:
   // fields
 
-  std::list<SMESH_HypoPredicate*> myPredicates;
+  //std::list<SMESH_HypoPredicate*> myPredicates;
+  SMESH_HypoPredicate* myPredicates[100];
+  int                  myNbPredicates;
 
   // private methods
 
@@ -111,7 +113,7 @@ class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
   {
     if ( pred ) {
       pred->_logical_op = bool_op;
-      myPredicates.push_back( pred );
+      myPredicates[ myNbPredicates++ ] = pred;
     }
   }