0020511: EDF 1101 SMESH : Add CGNS to Mesh Format Supported

-  virtual int Extent();
+  virtual int Extent() const;

diff --git a/src/SMESHDS/SMESHDS_Group.cxx b/src/SMESHDS/SMESHDS_Group.cxx
index a011fd6d02aef7e566816c3c86ac28322af6b5c1..1a9a75655510aeb7df366325a8a17bfee365d290 100644 (file)
--- a/src/SMESHDS/SMESHDS_Group.cxx
+++ b/src/SMESHDS/SMESHDS_Group.cxx
@@ -49,7 +49,7 @@ SMESHDS_Group::SMESHDS_Group (const int                 theID,
 //purpose  : 
 //=======================================================================
 
-int SMESHDS_Group::Extent()
+int SMESHDS_Group::Extent() const
 {
   return myGroup.Extent();
 }

diff --git a/src/SMESHDS/SMESHDS_Group.hxx b/src/SMESHDS/SMESHDS_Group.hxx
index 489d8dcb0da2aa3c960c1d97ce744d99f83ccc52..8dea353ddfcf93b4a62c88f385d0b5b252fbd7cd 100644 (file)
--- a/src/SMESHDS/SMESHDS_Group.hxx
+++ b/src/SMESHDS/SMESHDS_Group.hxx
@@ -46,7 +46,7 @@ class SMESHDS_EXPORT SMESHDS_Group : public SMESHDS_GroupBase
 
   virtual void SetType(SMDSAbs_ElementType theType);
 
-  virtual int Extent();
+  virtual int Extent() const;
 
   virtual bool IsEmpty();
 

diff --git a/src/SMESHDS/SMESHDS_GroupBase.cxx b/src/SMESHDS/SMESHDS_GroupBase.cxx
index c9d98f82321cdb14d4d3113708eb816414799e5a..91330d5417f7546cec0bc34552e855d41ab85da8 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupBase.cxx
+++ b/src/SMESHDS/SMESHDS_GroupBase.cxx
@@ -105,7 +105,7 @@ void SMESHDS_GroupBase::resetIterator()
 //purpose  : 
 //=======================================================================
 
-int SMESHDS_GroupBase::Extent()
+int SMESHDS_GroupBase::Extent() const
 {
   SMDS_ElemIteratorPtr it = GetElements();
   int nb = 0;

diff --git a/src/SMESHDS/SMESHDS_GroupBase.hxx b/src/SMESHDS/SMESHDS_GroupBase.hxx
index 0c0c41b854b54bfc6092cedd800973164d74a399..cd3378b1d968923b815c647a77ec9b23df3b2c44 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupBase.hxx
+++ b/src/SMESHDS/SMESHDS_GroupBase.hxx
@@ -58,7 +58,7 @@ class SMESHDS_EXPORT SMESHDS_GroupBase
 
   const char* GetStoreName () const { return myStoreName.c_str(); }
 
-  virtual int Extent();
+  virtual int Extent() const;
 
   virtual bool IsEmpty();
 
@@ -97,11 +97,12 @@ class SMESHDS_EXPORT SMESHDS_GroupBase
   const SMESHDS_Mesh*  myMesh;
   SMDSAbs_ElementType  myType;
   std::string          myStoreName;
+  Quantity_Color       myColor;
+
   // for GetID()
   int                  myCurIndex;
   int                  myCurID;
   SMDS_ElemIteratorPtr myIterator;
-  Quantity_Color       myColor;
 };
 
 #endif

diff --git a/src/SMESHDS/SMESHDS_GroupOnFilter.cxx b/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
index 8a984c2755cfd544bcaa3f3a944b4888f6a94ce4..8870f971fa34ac942d7b41e7950589729a029cbe 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
+++ b/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
@@ -66,7 +66,7 @@ void SMESHDS_GroupOnFilter::SetPredicate( const SMESH_PredicatePtr& thePredicate
  */
 //================================================================================
 
-int SMESHDS_GroupOnFilter::Extent()
+int SMESHDS_GroupOnFilter::Extent() const
 {
   update();
   return myElements.size();

diff --git a/src/SMESHDS/SMESHDS_GroupOnFilter.hxx b/src/SMESHDS/SMESHDS_GroupOnFilter.hxx
index 805378704f69c741b505fb5d53bc36cf2cdfa0cc..5b820a0cf5e20cbfb8c86c5cbe317c2acb2e120a 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupOnFilter.hxx
+++ b/src/SMESHDS/SMESHDS_GroupOnFilter.hxx
@@ -46,7 +46,7 @@ class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase
 
   SMESH_PredicatePtr GetPredicate() const { return myPredicate; }
 
-  virtual int Extent();
+  virtual int Extent() const;
 
   virtual bool Contains (const int theID);