correct ElementFactory, CellOfNode

diff --git a/src/SMDS/SMDS_CellOfNodes.cxx b/src/SMDS/SMDS_CellOfNodes.cxx
index 0aed491f4d68793b265f80e30a5348a133e32410..41c993088c6f733d5cabb02963b33f66f97240c5 100644 (file)
--- a/src/SMDS/SMDS_CellOfNodes.cxx
+++ b/src/SMDS/SMDS_CellOfNodes.cxx
@@ -25,28 +25,28 @@
 
 #include "SMDS_CellOfNodes.hxx"
 
-SMDS_CellOfNodes::SMDS_CellOfNodes( int id, int shapeID )
+SMDS_CellOfNodes::SMDS_CellOfNodes( smIdType id, smIdType shapeID )
   : myID( id )
 {
   setShapeID( shapeID );
 }
 
-void SMDS_CellOfNodes::setID(const int id)
+void SMDS_CellOfNodes::setID(const smIdType id)
 {
   myID = id;
 }
 
-int SMDS_CellOfNodes::GetID() const
+smIdType SMDS_CellOfNodes::GetID() const
 {
   return myID;
 }
 
-void SMDS_CellOfNodes::setShapeID( const int shapeID )
+void SMDS_CellOfNodes::setShapeID( const smIdType shapeID )
 {
   myShapeID = ( shapeID << BITS_SHIFT ) | ( myShapeID & BIT_IS_MARKED );
 }
 
-int SMDS_CellOfNodes::GetShapeID() const
+smIdType SMDS_CellOfNodes::GetShapeID() const
 {
   return myShapeID >> BITS_SHIFT;
 }

diff --git a/src/SMDS/SMDS_CellOfNodes.hxx b/src/SMDS/SMDS_CellOfNodes.hxx
index acedefeb8b406f49f860cbb2d0f1fd7fbb8632a1..6f52fa73247d0297bb54b315dca2020fca89bb2a 100644 (file)
--- a/src/SMDS/SMDS_CellOfNodes.hxx
+++ b/src/SMDS/SMDS_CellOfNodes.hxx
@@ -31,6 +31,8 @@
         
 #include "SMDS_MeshElement.hxx"
 
+#include <smIdType.hxx>
+
 // ============================================================
 /*!
  * \brief Base class for elements not contained in the mesh
@@ -42,8 +44,8 @@ class SMDS_EXPORT SMDS_CellOfNodes : public SMDS_MeshElement
 {
 public:
 
-  virtual int GetID() const;
-  virtual int GetShapeID() const;
+  virtual smIdType GetID() const;
+  virtual smIdType GetShapeID() const;
 
   virtual void setIsMarked( bool is ) const;
   virtual bool isMarked() const;
@@ -52,13 +54,13 @@ public:
 
  protected:
 
-  SMDS_CellOfNodes( int id = -1, int shapeID = 0);
+  SMDS_CellOfNodes( smIdType id = -1, smIdType shapeID = 0);
 
-  virtual void setID( const int id);
-  virtual void setShapeID( const int shapeID );
+  virtual void setID( const smIdType id);
+  virtual void setShapeID( const smIdType shapeID );
 
-  int  myID;
-  int  myShapeID;
+  smIdType  myID;
+  smIdType  myShapeID;
 
   enum Bits { // use the 1st right bit of myShapeId to set/unset a mark
     BIT_IS_MARKED = 1,

diff --git a/src/SMDS/SMDS_ElementFactory.cxx b/src/SMDS/SMDS_ElementFactory.cxx
index ed07ccdf84d73c2f845a325029535879316d7d74..a90965fe5d5d3b72900426d0a186e59340249185 100644 (file)
--- a/src/SMDS/SMDS_ElementFactory.cxx
+++ b/src/SMDS/SMDS_ElementFactory.cxx
@@ -92,11 +92,11 @@ SMDS_ElementFactory::~SMDS_ElementFactory()
 //================================================================================
 /*!
  * \brief Return a number of elements in a chunk
- *  \return smIdType - chunk size
+ *  \return int - chunk size
  */
 //================================================================================
 
-smIdType SMDS_ElementFactory::ChunkSize()
+int SMDS_ElementFactory::ChunkSize()
 {
   return theChunkSize;
 }
@@ -295,7 +295,7 @@ void SMDS_ElementFactory::Compact( std::vector<int>& theVtkIDsNewToOld )
   }
   else if ( newNbCells == maxCellID ) // no holes
   {
-    int newID, minLastID = std::min( myVtkIDs.size(), theVtkIDsNewToOld.size() );
+    smIdType newID, minLastID = std::min( myVtkIDs.size(), theVtkIDsNewToOld.size() );
     for ( newID = 0; newID < minLastID; ++newID )
       theVtkIDsNewToOld[ newID ] = myVtkIDs[ newID ];
     for ( ; newID < newNbCells; ++newID )
@@ -565,7 +565,7 @@ void SMDS_ElementChunk::UseElement( const int index )
  */
 //================================================================================
 
-int SMDS_ElementChunk::GetUnusedID() const
+smIdType SMDS_ElementChunk::GetUnusedID() const
 {
   TUsedRangeSet::set_iterator r = myUsedRanges.mySet.begin();
   for ( ; r != myUsedRanges.mySet.end(); ++r )
@@ -603,7 +603,7 @@ void SMDS_ElementChunk::Free( const SMDS_MeshElement* e )
  */
 //================================================================================
 
-int SMDS_ElementChunk::GetID( const SMDS_MeshElement* e ) const
+smIdType SMDS_ElementChunk::GetID( const SMDS_MeshElement* e ) const
 {
   return my1stID + Index( e );
 }

diff --git a/src/SMDS/SMDS_ElementFactory.hxx b/src/SMDS/SMDS_ElementFactory.hxx
index 1521067eda86e7b37ac58d0c4b5dcf3703faaf5e..01bae378a6b5fed6430ca6af0e4a9f67de93cd91 100644 (file)
--- a/src/SMDS/SMDS_ElementFactory.hxx
+++ b/src/SMDS/SMDS_ElementFactory.hxx
@@ -134,7 +134,7 @@ public:
   virtual bool CompactChangePointers();
 
   //! Return a number of elements in a chunk
-  static smIdType ChunkSize();
+  static int ChunkSize();
 };
 
 //------------------------------------------------------------------------------------
@@ -393,7 +393,7 @@ public:
   const SMDS_MeshElement* Element(int index) const { return & myElements[index]; }
 
   //! Return ID of the first non-used element
-  int  GetUnusedID() const;
+  smIdType  GetUnusedID() const;
 
   //! Mark an element as used
   void UseElement( const int index );
@@ -431,7 +431,7 @@ public:
 
   // Methods called by SMDS_MeshElement
 
-  int  GetID( const SMDS_MeshElement* e ) const;
+  smIdType  GetID( const SMDS_MeshElement* e ) const;
 
   int  GetVtkID( const SMDS_MeshElement* e ) const;
   void SetVTKID( const SMDS_MeshElement* e, const vtkIdType id );