Merge topic 'more-mtimetype-errors'

93bddde0 GetMTime: fix some missed mtime type changes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: David E DeMarle <dave.demarle@kitware.com>
Merge-request: !1949

Rendering/Core/vtkDiscretizableColorTransferFunction.cxx

@@ -71,7 +71,7 @@ vtkMTimeType vtkDiscretizableColorTransferFunction::GetMTime()
     }
   if (this->LookupTable)
     {
-    unsigned ltmtime = this->LookupTable->GetMTime();
+    vtkMTimeType ltmtime = this->LookupTable->GetMTime();
     mtime = ltmtime > mtime? ltmtime : mtime;
     }
 

Rendering/OSPRay/vtkOSPRayRendererNode.cxx

@@ -392,7 +392,7 @@ void vtkOSPRayRendererNode::Traverse(int operation)
   //let's see if we can avoid that in the common case when
   //the objects have not changed. Note we also cache in actornodes
   //to reuse already created ospray meshes
-  unsigned int recent = 0;
+  vtkMTimeType recent = 0;
   int numAct = 0; //catches removed actors
   while (!it->IsDoneWithTraversal())
     {
@@ -403,12 +403,12 @@ void vtkOSPRayRendererNode::Traverse(int operation)
     if (child)
       {
       numAct++;
-      recent = std::max(recent,(unsigned int)child->GetMTime());
+      recent = std::max(recent, child->GetMTime());
       }
     if (vchild)
       {
       numAct++;
-      recent = std::max(recent,(unsigned int)vchild->GetMTime());
+      recent = std::max(recent, vchild->GetMTime());
       }
 
     it->GoToNextItem();

Rendering/OSPRay/vtkOSPRayVolumeNode.cxx

@@ -53,9 +53,9 @@ void vtkOSPRayVolumeNode::PrintSelf(ostream& os, vtkIndent indent)
 }
 
 //----------------------------------------------------------------------------
-unsigned long vtkOSPRayVolumeNode::GetMTime()
+vtkMTimeType vtkOSPRayVolumeNode::GetMTime()
 {
-  unsigned long mtime = this->Superclass::GetMTime();
+  vtkMTimeType mtime = this->Superclass::GetMTime();
   vtkVolume *vol = (vtkVolume*)this->GetRenderable();
   if (vol->GetMTime() > mtime)
     {

Rendering/OSPRay/vtkOSPRayVolumeNode.h

@@ -42,7 +42,7 @@ public:
   // Description:
   // Overridden to take into account my renderables time, including
   // mapper and data into mapper inclusive of composite input
-  virtual unsigned long GetMTime();
+  virtual vtkMTimeType GetMTime();
 
 protected:
   vtkOSPRayVolumeNode();