From 79d7f3e57138d47ea70cb61f318b76110ee23b88 Mon Sep 17 00:00:00 2001 From: Johannes Obermayr Date: Wed, 8 Feb 2017 18:53:20 +0100 Subject: [PATCH] Fix build with VTK 7.1 which introduces vtkMTimeType. --- src/3rdParty/salomesmesh/inc/SMDS_Mesh.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMESHDS_Group.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMESHDS_GroupBase.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnFilter.hxx | 4 ++-- src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnGeom.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMESH_ControlsDef.hxx | 2 +- src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx | 8 ++++++++ src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp | 2 +- .../salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 4 ++-- src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_Group.cpp | 2 +- .../salomesmesh/src/SMESHDS/SMESHDS_GroupOnFilter.cpp | 2 +- .../salomesmesh/src/SMESHDS/SMESHDS_GroupOnGeom.cpp | 2 +- 13 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/3rdParty/salomesmesh/inc/SMDS_Mesh.hxx b/src/3rdParty/salomesmesh/inc/SMDS_Mesh.hxx index 8bafc92cc..39d31111d 100644 --- a/src/3rdParty/salomesmesh/inc/SMDS_Mesh.hxx +++ b/src/3rdParty/salomesmesh/inc/SMDS_Mesh.hxx @@ -754,7 +754,7 @@ public: inline void setMyModified() { this->myModified = true; } void Modified(); - unsigned long GetMTime() const; + VTK_MTIME_TYPE GetMTime() const; bool isCompacted(); protected: diff --git a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx index e5ce97512..9e4a23edd 100644 --- a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx +++ b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx @@ -68,7 +68,7 @@ public: int newNodeSize, std::vector& idCellsOldToNew, int newCellSize); - virtual unsigned long GetMTime(); + virtual VTK_MTIME_TYPE GetMTime(); // OUV_PORTING_VTK6: seems to be useless //virtual void Update(); //virtual void UpdateInformation(); diff --git a/src/3rdParty/salomesmesh/inc/SMESHDS_Group.hxx b/src/3rdParty/salomesmesh/inc/SMESHDS_Group.hxx index ab03035a9..8b62247da 100644 --- a/src/3rdParty/salomesmesh/inc/SMESHDS_Group.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESHDS_Group.hxx @@ -56,7 +56,7 @@ class SMESHDS_EXPORT SMESHDS_Group : public SMESHDS_GroupBase virtual SMDS_ElemIteratorPtr GetElements() const; - virtual int GetTic() const; + virtual VTK_MTIME_TYPE GetTic() const; bool Add (const int theID); diff --git a/src/3rdParty/salomesmesh/inc/SMESHDS_GroupBase.hxx b/src/3rdParty/salomesmesh/inc/SMESHDS_GroupBase.hxx index bb0bf250f..14f5c6b14 100644 --- a/src/3rdParty/salomesmesh/inc/SMESHDS_GroupBase.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESHDS_GroupBase.hxx @@ -71,7 +71,7 @@ class SMESHDS_EXPORT SMESHDS_GroupBase virtual int GetID (const int theIndex); // use it for iterations 1..Extent() - virtual int GetTic() const = 0; + virtual VTK_MTIME_TYPE GetTic() const = 0; virtual ~SMESHDS_GroupBase() {} diff --git a/src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnFilter.hxx b/src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnFilter.hxx index c53f3bc8f..aa5464774 100644 --- a/src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnFilter.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnFilter.hxx @@ -65,7 +65,7 @@ class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase virtual SMDS_ElemIteratorPtr GetElements() const; - virtual int GetTic() const; + virtual VTK_MTIME_TYPE GetTic() const; bool IsUpToDate() const; @@ -86,7 +86,7 @@ class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase std::vector< int > myMeshInfo; std::vector< const SMDS_MeshElement*> myElements; bool myElementsOK; - size_t myMeshModifTime; // when myMeshInfo was updated + VTK_MTIME_TYPE myMeshModifTime; // when myMeshInfo was updated int myPredicateTic; size_t myNbElemToSkip; }; diff --git a/src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnGeom.hxx b/src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnGeom.hxx index 42a567e17..95901ba91 100644 --- a/src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnGeom.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnGeom.hxx @@ -53,7 +53,7 @@ class SMESHDS_EXPORT SMESHDS_GroupOnGeom: public SMESHDS_GroupBase virtual SMDS_ElemIteratorPtr GetElements() const; - virtual int GetTic() const; + virtual VTK_MTIME_TYPE GetTic() const; private: diff --git a/src/3rdParty/salomesmesh/inc/SMESH_ControlsDef.hxx b/src/3rdParty/salomesmesh/inc/SMESH_ControlsDef.hxx index 8a2ff7e24..fb926677f 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_ControlsDef.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_ControlsDef.hxx @@ -110,7 +110,7 @@ namespace SMESH{ */ class SMESHCONTROLS_EXPORT TMeshModifTracer { - unsigned long myMeshModifTime; + VTK_MTIME_TYPE myMeshModifTime; const SMDS_Mesh* myMesh; public: TMeshModifTracer(); diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx index 9e55e313f..7f89573ef 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx @@ -27,6 +27,8 @@ #ifndef _SMESH_SMDS_HXX_ #define _SMESH_SMDS_HXX_ +#include + #ifdef WIN32 #if defined SMDS_EXPORTS #define SMDS_EXPORT __declspec( dllexport ) @@ -37,4 +39,10 @@ #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_Mesh.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp index b491a72c2..0dcfb8cc7 100644 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp @@ -4836,7 +4836,7 @@ void SMDS_Mesh::Modified() } //! get last modification timeStamp -unsigned long SMDS_Mesh::GetMTime() const +VTK_MTIME_TYPE SMDS_Mesh::GetMTime() const { return this->myModifTime; } diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp index 5fe82a432..fbd903b1e 100644 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp @@ -82,9 +82,9 @@ SMDS_UnstructuredGrid::~SMDS_UnstructuredGrid() { } -unsigned long SMDS_UnstructuredGrid::GetMTime() +VTK_MTIME_TYPE SMDS_UnstructuredGrid::GetMTime() { - unsigned long mtime = vtkUnstructuredGrid::GetMTime(); + VTK_MTIME_TYPE mtime = vtkUnstructuredGrid::GetMTime(); MESSAGE("vtkUnstructuredGrid::GetMTime: " << mtime); return mtime; } diff --git a/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_Group.cpp b/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_Group.cpp index 6ffa1b19c..a4a250fdd 100644 --- a/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_Group.cpp +++ b/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_Group.cpp @@ -177,7 +177,7 @@ SMDS_ElemIteratorPtr SMESHDS_Group::GetElements() const */ //================================================================================ -int SMESHDS_Group::GetTic() const +VTK_MTIME_TYPE SMESHDS_Group::GetTic() const { return myGroup.Tic(); } diff --git a/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnFilter.cpp b/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnFilter.cpp index 7b24c6278..04de69b67 100644 --- a/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnFilter.cpp +++ b/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnFilter.cpp @@ -332,7 +332,7 @@ int SMESHDS_GroupOnFilter::getElementIds( void* ids, size_t idSize ) const */ //================================================================================ -int SMESHDS_GroupOnFilter::GetTic() const +VTK_MTIME_TYPE SMESHDS_GroupOnFilter::GetTic() const { return GetMesh()->GetMTime() * myPredicateTic; } diff --git a/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnGeom.cpp b/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnGeom.cpp index 65a39a7bc..c723d4c83 100644 --- a/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnGeom.cpp +++ b/src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnGeom.cpp @@ -134,7 +134,7 @@ bool SMESHDS_GroupOnGeom::Contains (const SMDS_MeshElement* elem) */ //================================================================================ -int SMESHDS_GroupOnGeom::GetTic() const +VTK_MTIME_TYPE SMESHDS_GroupOnGeom::GetTic() const { return GetMesh()->GetMTime(); }