Commit 4021de7b authored by David E. DeMarle's avatar David E. DeMarle

Merge branch 'gcc-4.8.3-compile-error-rel' into release

Change-Id: I1c669bab1c7449970adb43b4f2d334ba95e6e635
parents 0d24c40c 0d491037
......@@ -38,6 +38,7 @@
#include <vector>
#include <utility>
#include <algorithm>
#include <cstddef>
using std::list;
using std::deque;
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment