From d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516 Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Avalos Date: Wed, 22 Nov 2023 16:42:06 -0300 Subject: [PATCH] 3rdPart/salomesmesh - fix for vtk 9.3 compatibility minimum required version is 7.1 --- src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx | 4 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx index 7f89573efd0d..47a52fe585fe 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx @@ -39,10 +39,6 @@ #define SMDS_EXPORT #endif -#ifdef VTK_HAS_MTIME_TYPE #define VTK_MTIME_TYPE vtkMTimeType -#else -#define VTK_MTIME_TYPE unsigned long -#endif #endif diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp index 7e3de0070a02..e9895d615717 100644 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp @@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() GetLinks()->Allocate(this->GetNumberOfPoints()); GetLinks()->Register(this); //FIXME: vtk9 + #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) GetLinks()->BuildLinks(this); + #else + GetLinks()->SetDataSet(this); + GetLinks()->BuildLinks(); + #endif GetLinks()->Delete(); #else this->Links = SMDS_CellLinks::New();