--- src/IVtkVTK/IVtkVTK_ShapeData.cxx.orig	2015-09-26 00:18:54.000000000 +1000
+++ src/IVtkVTK/IVtkVTK_ShapeData.cxx	2018-01-11 09:16:59.734906202 +1000
@@ -80,9 +80,15 @@
   vtkIdType aPointIdVTK = thePointId;
   myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK);
   const vtkIdType aShapeIDVTK = theShapeID;
+#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
   mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
   const vtkIdType aType = theMeshType;
   myMeshTypes->InsertNextTupleValue (&aType);
+#else
+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
+  const vtkIdType aType = theMeshType;
+  myMeshTypes->InsertNextTypedTuple (&aType);
+#endif
 }
 
 //================================================================
@@ -97,9 +103,15 @@
   vtkIdType aPoints[2] = { thePointId1, thePointId2 };
   myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
   const vtkIdType aShapeIDVTK = theShapeID;
+#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
   mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
   const vtkIdType aType = theMeshType;
   myMeshTypes->InsertNextTupleValue (&aType);
+#else
+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
+  const vtkIdType aType = theMeshType;
+  myMeshTypes->InsertNextTypedTuple (&aType);
+#endif
 }
 
 //================================================================
@@ -124,9 +136,15 @@
 
     myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
     const vtkIdType aShapeIDVTK = theShapeID;
+#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
     mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
     const vtkIdType aType = theMeshType;
     myMeshTypes->InsertNextTupleValue (&aType);
+#else
+    mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
+    const vtkIdType aType = theMeshType;
+    myMeshTypes->InsertNextTypedTuple (&aType);
+#endif
     anIdList->Delete();
   }
 }
@@ -144,7 +162,13 @@
   vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
   myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
   const vtkIdType aShapeIDVTK = theShapeID;
+#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
   mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
   const vtkIdType aType = theMeshType;
   myMeshTypes->InsertNextTupleValue (&aType);
+#else
+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
+  const vtkIdType aType = theMeshType;
+  myMeshTypes->InsertNextTypedTuple (&aType);
+#endif
 }