orion / rpms / paraview

Forked from rpms/paraview 4 years ago
Clone
Blob Blame History Raw
diff -up ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx.cstddef ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx
--- ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx.cstddef	2013-12-24 19:17:44.000000000 -0700
+++ ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx	2013-12-31 14:42:48.313911486 -0700
@@ -33,6 +33,7 @@
 #include "vtkgl.h"
 #include "vtkMPI.h"
 
+#include <cstddef>
 #include <list>
 #include <deque>
 #include <vector>
@@ -1272,9 +1273,9 @@ int vtkPSurfaceLICComposite::Gather(
   vector<MPI_Request> mpiSendReqs;
   deque<MPI_Datatype> mpiTypes;
   #ifdef PBO_RECV_BUFFERS
-  deque<vtkPixelBufferObject*> recvPBOs(nTransactions, NULL);
+  deque<vtkPixelBufferObject*> recvPBOs(nTransactions, static_cast<vtkPixelBufferObject*>(NULL));
   #else
-  deque<void*> recvBufs(nTransactions, NULL);
+  deque<void*> recvBufs(nTransactions, static_cast<void*>(NULL));
   #endif
   for (int j=0; j<nTransactions; ++j)
     {