X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_HypoFilter.hxx;h=32a7389d2349647ba1c3e03fa36a8ea14bb6c0bd;hp=b4ace7d2a2434ed538024baf67ac90d6ab67b083;hb=cb55604f37e3d2583272fd436bb6557b041948b5;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6

diff --git a/src/SMESH/SMESH_HypoFilter.hxx b/src/SMESH/SMESH_HypoFilter.hxx
index b4ace7d2a..32a7389d2 100644
--- a/src/SMESH/SMESH_HypoFilter.hxx
+++ b/src/SMESH/SMESH_HypoFilter.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SMESH SMESH : implementaion of SMESH idl descriptions
+//  SMESH SMESH : implementation of SMESH idl descriptions
 //  File   : SMESH_HypoFilter.hxx
 //  Module : SMESH
 //
@@ -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,20 +98,22 @@ 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
 
   enum Logical { AND, AND_NOT, OR, OR_NOT };
   enum Comparison { EQUAL, NOT_EQUAL, MORE, LESS };
 
-  SMESH_HypoFilter(const SMESH_HypoFilter& other){}
+  SMESH_HypoFilter(const SMESH_HypoFilter& /*other*/){}
 
   void add( Logical bool_op, SMESH_HypoPredicate* pred )
   {
     if ( pred ) {
       pred->_logical_op = bool_op;
-      myPredicates.push_back( pred );
+      myPredicates[ myNbPredicates++ ] = pred;
     }
   }