Commit 70434aec authored by Ken Martin's avatar Ken Martin
Browse files

merges from the main tree

parent 7ae3bbc9
......@@ -23,7 +23,7 @@
#include "vtkMPI.h"
vtkCxxRevisionMacro(vtkMPICommunicator, "1.30.6.1");
vtkCxxRevisionMacro(vtkMPICommunicator, "1.30.6.2");
vtkStandardNewMacro(vtkMPICommunicator);
vtkCxxSetObjectMacro(vtkMPICommunicator,Group,vtkMPIGroup);
......@@ -52,7 +52,14 @@ MPI_Comm* vtkMPICommunicatorOpaqueComm::GetHandle()
# ifdef VTK_USE_64BIT_IDS
MPI_Datatype vtkMPICommunicatorGetMPIType()
{
#if VTK_SIZEOF_LONG == 8
return MPI_LONG;
#elif defined(MPI_LONG_LONG)
return MPI_LONG_LONG;
#else
vtkGenericWarningMacro("This systems MPI doesnt seem to support 64 bit ids and you have 64 bit IDs turned on. Please contact VTK mailing list.");
return MPI_INT;
#endif
}
# endif
#else
......
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