From: mnt <mnt@opencascade.com>
Date: Tue, 19 Feb 2019 11:49:24 +0000 (+0300)
Subject: Porting to DEV version of OCCT
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7c6f48b6e9d1df34ae5a4a7b26c0807ea9bc7929;p=modules%2Fsmesh.git

Porting to DEV version of OCCT
---

diff --git a/src/SMESHUtils/SMESH_Delaunay.cxx b/src/SMESHUtils/SMESH_Delaunay.cxx
index c62c2c01b..8ae5f1761 100644
--- a/src/SMESHUtils/SMESH_Delaunay.cxx
+++ b/src/SMESHUtils/SMESH_Delaunay.cxx
@@ -32,6 +32,8 @@
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepMesh_Delaun.hxx>
 
+#include <Basics_OCCTVersion.hxx>
+
 //================================================================================
 /*!
  * \brief Construct a Delaunay triangulation of given boundary nodes
@@ -82,7 +84,11 @@ SMESH_Delaunay::SMESH_Delaunay(const std::vector< const UVPtStructVec* > & bound
   _bndNodes.resize( nbP );
 
   // fill boundary points
+#if OCC_VERSION_LARGE <= 0x07030000
   BRepMesh::Array1OfVertexOfDelaun bndVert( 1, 1 + nbP );
+#else
+  IMeshData::Array1OfVertexOfDelaun bndVert( 1, 1 + nbP );
+#endif
   BRepMesh_Vertex v( 0, 0, BRepMesh_Frontier );
   for ( size_t iW = 0; iW < boundaryNodes.size(); ++iW )
   {
@@ -218,7 +224,11 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY&
     gp_XY seg = uv - gc;
 
     tria->Edges( linkIDs, ori );
+#if OCC_VERSION_LARGE <= 0x07030000
     int triaID = _triaDS->IndexOf( *tria );
+#else
+    int triaID = tria - & ( _triaDS->GetElement( 0 ));
+#endif
     tria = 0;
 
     for ( int i = 0; i < 3; ++i )
@@ -262,8 +272,13 @@ const BRepMesh_Triangle* SMESH_Delaunay::GetTriangleNear( int iBndNode )
 {
   int nodeIDs[3];
   int nbNbNodes = _bndNodes.size();
+#if OCC_VERSION_LARGE <= 0x07030000
   const BRepMesh::ListOfInteger & linkIds = _triaDS->LinksConnectedTo( iBndNode + 1 );
   BRepMesh::ListOfInteger::const_iterator iLink = linkIds.cbegin();
+#else
+  const IMeshData::ListOfInteger & linkIds = _triaDS->LinksConnectedTo( iBndNode + 1 );
+  IMeshData::ListOfInteger::const_iterator iLink = linkIds.cbegin();
+#endif
   for ( ; iLink != linkIds.cend(); ++iLink )
   {
     const BRepMesh_PairOfIndex & triaIds = _triaDS->ElementsConnectedTo( *iLink );
diff --git a/src/SMESHUtils/SMESH_Delaunay.hxx b/src/SMESHUtils/SMESH_Delaunay.hxx
index 660b3dbba..acaa535e9 100644
--- a/src/SMESHUtils/SMESH_Delaunay.hxx
+++ b/src/SMESHUtils/SMESH_Delaunay.hxx
@@ -29,6 +29,7 @@
 
 #include "SMESH_TypeDefs.hxx"
 
+#include <TopoDS_Face.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 
 /*!