+ port to OCC 7.0

FreeCAD · May 14, 2016 · bca7a18 · bca7a18
1 parent 7433b65
commit bca7a18
Show file tree

Hide file tree

Showing 44 changed files with 380 additions and 323 deletions.
diff --git a/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx b/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx
@@ -1,27 +1,27 @@
 //  SMESH  SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC 
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File      : SMESH_MeshVSLink.cxx
-// Created   : Mon Dec 1 09:00:00 2008
-// Author    : Sioutis Fotios
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File      : SMESH_MeshVSLink.cxx
+// Created   : Mon Dec 1 09:00:00 2008
+// Author    : Sioutis Fotios
 // Module    : SMESH
 
 #ifndef _Handle_SMESH_MeshVSLink_HeaderFile
@@ -33,6 +33,11 @@
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
+#ifndef _Standard_Version_HeaderFile
+#include <Standard_Version.hxx>
+#endif
+
+#if OCC_VERSION_HEX < 0x070000
 #ifndef _Handle_MeshVS_DataSource3D_HeaderFile
 #include <Handle_MeshVS_DataSource3D.hxx>
 #endif
@@ -74,4 +79,5 @@ class Handle(SMESH_MeshVSLink) : public Handle(MeshVS_DataSource3D) {
 
    Standard_EXPORT static const Handle(SMESH_MeshVSLink) DownCast(const Handle(Standard_Transient)& AnObject);
 };
+#endif // OCC_VERSION_HEX < 0x070000
 #endif
diff --git a/src/3rdParty/salomesmesh/inc/SMESH_Mesh.hxx b/src/3rdParty/salomesmesh/inc/SMESH_Mesh.hxx
@@ -38,6 +38,7 @@
 
 #include "SMESH_Exception.hxx"
 
+#include <Standard_Version.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
@@ -47,7 +48,9 @@
 class SMESH_Gen;
 class SMESHDS_Document;
 class SMESH_Group;
+#if OCC_VERSION_HEX < 0x070000
 class TopTools_ListOfShape;
+#endif
 class SMESH_subMesh;
 class SMESH_HypoFilter;
 class TopoDS_Solid;

diff --git a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx
@@ -1,27 +1,27 @@
 //  SMESH  SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC 
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File      : SMESH_MeshVSLink.cxx
-// Created   : Mon Dec 1 09:00:00 2008
-// Author    : Sioutis Fotios
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File      : SMESH_MeshVSLink.cxx
+// Created   : Mon Dec 1 09:00:00 2008
+// Author    : Sioutis Fotios
 // Module    : SMESH
 
 #ifndef _SMESH_MeshVSLink_HeaderFile
@@ -36,11 +36,11 @@
 #ifndef _TColStd_PackedMapOfInteger_HeaderFile
 #include <TColStd_PackedMapOfInteger.hxx>
 #endif
-#ifndef _Handle_TColStd_HArray2OfInteger_HeaderFile
-#include <Handle_TColStd_HArray2OfInteger.hxx>
+#ifndef _TColStd_HArray2OfInteger_HeaderFile
+#include <TColStd_HArray2OfInteger.hxx>
 #endif
-#ifndef _Handle_TColStd_HArray2OfReal_HeaderFile
-#include <Handle_TColStd_HArray2OfReal.hxx>
+#ifndef _TColStd_HArray2OfReal_HeaderFile
+#include <TColStd_HArray2OfReal.hxx>
 #endif
 #ifndef _MeshVS_DataSource3D_HeaderFile
 #include <MeshVS_DataSource3D.hxx>
@@ -57,16 +57,22 @@
 #ifndef _Standard_Address_HeaderFile
 #include <Standard_Address.hxx>
 #endif
-#ifndef _Handle_TColStd_HArray1OfInteger_HeaderFile
-#include <Handle_TColStd_HArray1OfInteger.hxx>
+#ifndef _TColStd_HArray1OfInteger_HeaderFile
+#include <TColStd_HArray1OfInteger.hxx>
 #endif
 #ifndef _Standard_Real_HeaderFile
 #include <Standard_Real.hxx>
 #endif
 #ifndef _SMESH_Mesh_HeaderFile
 #include <SMESH_Mesh.hxx>
 #endif
+#ifndef _Standard_Version_HeaderFile
+#include <Standard_Version.hxx>
+#endif
 
+#if OCC_VERSION_HEX >= 0x070000
+DEFINE_STANDARD_HANDLE(SMESH_MeshVSLink, MeshVS_DataSource3D)
+#endif
 class SMESH_MeshVSLink : public MeshVS_DataSource3D {
 
   public:
@@ -125,7 +131,11 @@ class SMESH_MeshVSLink : public MeshVS_DataSource3D {
 
 	// Type management
 	//
-	Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
+#if OCC_VERSION_HEX >= 0x070000
+    DEFINE_STANDARD_RTTIEXT(SMESH_MeshVSLink,MeshVS_DataSource3D)
+#else
+    Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
+#endif
 
   protected:
 	// Methods PROTECTED

diff --git a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.ixx b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.ixx
@@ -1,27 +1,27 @@
 //  SMESH  SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC 
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// File      : SMESH_MeshVSLink.cxx
-// Created   : Mon Dec 1 09:00:00 2008
-// Author    : Sioutis Fotios
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File      : SMESH_MeshVSLink.cxx
+// Created   : Mon Dec 1 09:00:00 2008
+// Author    : Sioutis Fotios
 // Module    : SMESH
 
 #include <SMESH_MeshVSLink.jxx>
@@ -30,6 +30,11 @@
 #include <Standard_TypeMismatch.hxx>
 #endif
 
+#ifndef _Standard_Version_HeaderFile
+#include <Standard_Version.hxx>
+#endif
+
+#if OCC_VERSION_HEX < 0x070000
 Standard_EXPORT Handle_Standard_Type& SMESH_MeshVSLink_Type_()
 {
   static Handle_Standard_Type aType1 = STANDARD_TYPE(MeshVS_DataSource3D);
@@ -69,3 +74,4 @@ const Handle(Standard_Type)& SMESH_MeshVSLink::DynamicType() const
 { 
   return STANDARD_TYPE(SMESH_MeshVSLink) ; 
 }
+#endif
diff --git a/src/3rdParty/salomesmesh/inc/StdMeshers_Hexa_3D.hxx b/src/3rdParty/salomesmesh/inc/StdMeshers_Hexa_3D.hxx
@@ -37,7 +37,9 @@
 
 #include "SMESH_MesherHelper.hxx"
 
+#if OCC_VERSION_HEX < 0x070000
 class TopTools_IndexedMapOfShape;
+#endif
 
 typedef struct point3Dstruct
 {

diff --git a/src/3rdParty/salomesmesh/inc/StdMeshers_ProjectionUtils.hxx b/src/3rdParty/salomesmesh/inc/StdMeshers_ProjectionUtils.hxx
@@ -30,6 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include <TopTools_DataMapOfShapeShape.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Face.hxx>
@@ -42,7 +43,6 @@ class SMDS_MeshNode;
 class SMESH_Mesh;
 class SMESH_Hypothesis;
 class SMESH_subMesh;
-class TopTools_IndexedDataMapOfShapeListOfShape;
 
 /*!
  * \brief Class encapsulating methods common to Projection algorithms