X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshEdge.hxx;h=290210ca324b7265467d3186264a23cc29c37a5e;hb=f87e54ae3a450f6adeee75d1b42c3b17e9c6250c;hp=4d82d003c321bb7f037ebeddcc973338a0421a16;hpb=007c0191337598a9431229b2d3dec7fde25d4c4e;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshEdge.hxx b/src/SMDS/SMDS_MeshEdge.hxx
index 4d82d003c..290210ca3 100644
--- a/src/SMDS/SMDS_MeshEdge.hxx
+++ b/src/SMDS/SMDS_MeshEdge.hxx
@@ -27,98 +27,29 @@
 #ifndef _SMDS_MeshEdge_HeaderFile
 #define _SMDS_MeshEdge_HeaderFile
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Handle_SMDS_MeshEdge_HeaderFile
-#include "Handle_SMDS_MeshEdge.hxx"
-#endif
-
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _SMDS_MeshElement_HeaderFile
 #include "SMDS_MeshElement.hxx"
-#endif
-#ifndef _Standard_Address_HeaderFile
-#include <Standard_Address.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
-#include <Standard_OStream.hxx>
-#endif
-
-
-class SMDS_MeshEdge : public SMDS_MeshElement {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT SMDS_MeshEdge(const Standard_Integer ID,const Standard_Integer idnode1,const Standard_Integer idnode2);
-Standard_EXPORT inline   void ComputeKey() ;
-Standard_EXPORT inline   Standard_Integer GetKey() const;
-Standard_EXPORT inline   Standard_Address GetConnections() const;
-Standard_EXPORT inline   Standard_Integer GetConnection(const Standard_Integer rank) const;
-Standard_EXPORT   void Print(Standard_OStream& OS) const;
-Standard_EXPORT ~SMDS_MeshEdge();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMDS_MeshEdge_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
+#include <iostream>
 
-protected:
+class SMDS_MeshEdge:public SMDS_MeshElement
+{
 
- // Methods PROTECTED
- // 
+  public:
+	SMDS_MeshEdge(const SMDS_MeshNode * node1,
+                      const SMDS_MeshNode * node2);
+        bool ChangeNodes(const SMDS_MeshNode * node1,
+                         const SMDS_MeshNode * node2);
+	void Print(std::ostream & OS) const;
 
+	SMDSAbs_ElementType GetType() const;
+	int NbNodes() const;
+	int NbEdges() const;
+	friend bool operator<(const SMDS_MeshEdge& e1, const SMDS_MeshEdge& e2);
+  protected:
+	SMDS_ElemIteratorPtr
+		elementsIterator(SMDSAbs_ElementType type) const;
 
- // Fields PROTECTED
- //
-
-
-private: 
-
- // Methods PRIVATE
- // 
-Standard_EXPORT   void SetConnections(const Standard_Integer idnode1,const Standard_Integer idnode2) ;
-
-
- // Fields PRIVATE
- //
-Standard_Integer myKey;
-Standard_Integer myNodes[2];
-
+  private:
+	const SMDS_MeshNode* myNodes[2];
 
 };
-
-
-#include "SMDS_MeshEdge.lxx"
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif