suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with VTK 7.1 which introduces vtkMTimeType.

Browse Source
This commit is contained in:
Johannes Obermayr 2017-02-08 18:53:20 +01:00 committed by wmayer
parent 7ec37c9e39
commit 79d7f3e571
13 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdParty/salomesmesh/inc/SMDS_Mesh.hxx vendored
View File

@ -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:

2
src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx vendored
View File

@ -68,7 +68,7 @@ public:
int newNodeSize,
std::vector<int>& 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();

2
src/3rdParty/salomesmesh/inc/SMESHDS_Group.hxx vendored
View File

@ -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);

2
src/3rdParty/salomesmesh/inc/SMESHDS_GroupBase.hxx vendored
View File

@ -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() {}

4
src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnFilter.hxx vendored
View File

@ -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;
};

2
src/3rdParty/salomesmesh/inc/SMESHDS_GroupOnGeom.hxx vendored
View File

@ -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:

2
src/3rdParty/salomesmesh/inc/SMESH_ControlsDef.hxx vendored
View File

@ -110,7 +110,7 @@ namespace SMESH{
*/
class SMESHCONTROLS_EXPORT TMeshModifTracer
{
unsigned long myMeshModifTime;
VTK_MTIME_TYPE myMeshModifTime;
const SMDS_Mesh* myMesh;
public:
TMeshModifTracer();

8
src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx vendored
View File

@ -27,6 +27,8 @@
#ifndef _SMESH_SMDS_HXX_
#define _SMESH_SMDS_HXX_
#include <vtkType.h>
#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

2
src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp vendored
View File

@ -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;
}

4
src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp vendored
View File

@ -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;
}

2
src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_Group.cpp vendored
View File

@ -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();
}

2
src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnFilter.cpp vendored
View File

@ -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;
}

2
src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_GroupOnGeom.cpp vendored
View File

@ -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();
}