From 65fc526a83ac829628a9462f61fa57f1801e2c7e Mon Sep 17 00:00:00 2001 From: Ryan Krattiger Date: Fri, 10 Jun 2022 15:58:00 -0500 Subject: [PATCH] Put VTK symbols inside ABI namespace macros. VTK_ABI_NAMESPACE_{BEGIN,END} macro is inserted around all VTK symbols. Exclusions: * C interfaces, such as GetVTKVersion and the python module. * third-party libraries and external libraries that are not maintained by VTK but are part of the VTK repository. * Cxx module tests * Utilities * Wrapping/Tools --- Accelerators/Vtkm/Core/vtkmDataArray.cxx | 2 + Accelerators/Vtkm/Core/vtkmDataArray.h | 4 + Accelerators/Vtkm/Core/vtkmFilterPolicy.h | 2 + .../Vtkm/Core/vtkmlib/DataArrayConverters.cxx | 2 + .../Vtkm/Core/vtkmlib/DataArrayConverters.h | 15 +- .../Vtkm/Core/vtkmlib/DataArrayConverters.hxx | 2 + Accelerators/Vtkm/Core/vtkmlib/PortalTraits.h | 2 + Accelerators/Vtkm/Core/vtkmlib/Portals.cxx | 2 + Accelerators/Vtkm/Core/vtkmlib/Portals.h | 7 + Accelerators/Vtkm/Core/vtkmlib/Portals.hxx | 2 + .../Vtkm/Core/vtkmlib/vtkmDataArray.hxx | 4 + .../Vtkm/Core/vtkmlib/vtkmInitializer.cxx | 2 + .../Vtkm/Core/vtkmlib/vtkmInitializer.h | 2 + .../Vtkm/DataModel/vtkmConfigDataModel.h.in | 6 +- Accelerators/Vtkm/DataModel/vtkmDataSet.cxx | 2 + Accelerators/Vtkm/DataModel/vtkmDataSet.h | 3 + .../Vtkm/DataModel/vtkmFilterPolicy.h | 2 + .../DataModel/vtkmlib/ArrayConverters.cxx | 4 + .../Vtkm/DataModel/vtkmlib/ArrayConverters.h | 14 +- .../DataModel/vtkmlib/ArrayConverters.hxx | 2 + .../DataModel/vtkmlib/ArrayConvertersReal.cxx | 2 + .../vtkmlib/ArrayConvertersSigned.cxx | 2 + .../vtkmlib/ArrayConvertersUnsigned.cxx | 2 + .../DataModel/vtkmlib/CellSetConverters.cxx | 4 + .../DataModel/vtkmlib/CellSetConverters.h | 6 + .../DataModel/vtkmlib/DataSetConverters.cxx | 4 + .../DataModel/vtkmlib/DataSetConverters.h | 6 + .../DataModel/vtkmlib/ImageDataConverter.cxx | 4 + .../DataModel/vtkmlib/ImageDataConverter.h | 6 + .../vtkmlib/ImplicitFunctionConverter.cxx | 2 + .../vtkmlib/ImplicitFunctionConverter.h | 4 + .../DataModel/vtkmlib/PolyDataConverter.cxx | 6 + .../DataModel/vtkmlib/PolyDataConverter.h | 6 + .../vtkmlib/UnstructuredGridConverter.cxx | 4 + .../vtkmlib/UnstructuredGridConverter.h | 6 + .../Vtkm/Filters/vtkmAverageToCells.cxx | 2 + .../Vtkm/Filters/vtkmAverageToCells.h | 2 + .../Vtkm/Filters/vtkmAverageToPoints.cxx | 2 + .../Vtkm/Filters/vtkmAverageToPoints.h | 2 + Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx | 2 + Accelerators/Vtkm/Filters/vtkmCleanGrid.h | 2 + Accelerators/Vtkm/Filters/vtkmClip.cxx | 2 + Accelerators/Vtkm/Filters/vtkmClip.h | 2 + .../vtkmClipInstantiationsWithField.cxx | 2 + ...ClipInstantiationsWithImplicitFunction.cxx | 2 + Accelerators/Vtkm/Filters/vtkmClipInternals.h | 2 + .../Vtkm/Filters/vtkmConfigFilters.h.in | 6 +- Accelerators/Vtkm/Filters/vtkmContour.cxx | 2 + Accelerators/Vtkm/Filters/vtkmContour.h | 2 + .../Filters/vtkmCoordinateSystemTransform.cxx | 2 + .../Filters/vtkmCoordinateSystemTransform.h | 2 + .../Vtkm/Filters/vtkmExternalFaces.cxx | 2 + Accelerators/Vtkm/Filters/vtkmExternalFaces.h | 2 + Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx | 2 + Accelerators/Vtkm/Filters/vtkmExtractVOI.h | 2 + .../Vtkm/Filters/vtkmFilterOverrides.cxx.in | 2 + .../Vtkm/Filters/vtkmFilterOverrides.h | 2 + Accelerators/Vtkm/Filters/vtkmGradient.cxx | 2 + Accelerators/Vtkm/Filters/vtkmGradient.h | 2 + Accelerators/Vtkm/Filters/vtkmHistogram.cxx | 2 + Accelerators/Vtkm/Filters/vtkmHistogram.h | 2 + .../Vtkm/Filters/vtkmImageConnectivity.cxx | 2 + .../Vtkm/Filters/vtkmImageConnectivity.h | 2 + .../Vtkm/Filters/vtkmLevelOfDetail.cxx | 2 + Accelerators/Vtkm/Filters/vtkmLevelOfDetail.h | 2 + Accelerators/Vtkm/Filters/vtkmNDHistogram.cxx | 2 + Accelerators/Vtkm/Filters/vtkmNDHistogram.h | 2 + .../Vtkm/Filters/vtkmPointElevation.cxx | 2 + .../Vtkm/Filters/vtkmPointElevation.h | 2 + .../Vtkm/Filters/vtkmPointTransform.cxx | 2 + .../Vtkm/Filters/vtkmPointTransform.h | 2 + .../Vtkm/Filters/vtkmPolyDataNormals.cxx | 2 + .../Vtkm/Filters/vtkmPolyDataNormals.h | 2 + Accelerators/Vtkm/Filters/vtkmProbe.cxx | 2 + Accelerators/Vtkm/Filters/vtkmProbe.h | 2 + Accelerators/Vtkm/Filters/vtkmThreshold.cxx | 2 + Accelerators/Vtkm/Filters/vtkmThreshold.h | 2 + .../Filters/vtkmTriangleMeshPointNormals.cxx | 2 + .../Filters/vtkmTriangleMeshPointNormals.h | 2 + Accelerators/Vtkm/Filters/vtkmWarpScalar.cxx | 2 + Accelerators/Vtkm/Filters/vtkmWarpScalar.h | 2 + Accelerators/Vtkm/Filters/vtkmWarpVector.cxx | 2 + Accelerators/Vtkm/Filters/vtkmWarpVector.h | 2 + CMake/vtkEncodeString.cmake | 17 +- CMake/vtkObjectFactory.cxx.in | 3 + CMake/vtkObjectFactory.h.in | 4 + Charts/Core/vtkAxis.cxx | 2 + Charts/Core/vtkAxis.h | 2 + Charts/Core/vtkAxisExtended.cxx | 2 + Charts/Core/vtkAxisExtended.h | 2 + Charts/Core/vtkCategoryLegend.cxx | 2 + Charts/Core/vtkCategoryLegend.h | 2 + Charts/Core/vtkChart.cxx | 2 + Charts/Core/vtkChart.h | 2 + Charts/Core/vtkChartBox.cxx | 2 + Charts/Core/vtkChartBox.h | 2 + Charts/Core/vtkChartHistogram2D.cxx | 2 + Charts/Core/vtkChartHistogram2D.h | 2 + Charts/Core/vtkChartLegend.cxx | 2 + Charts/Core/vtkChartLegend.h | 2 + Charts/Core/vtkChartMatrix.cxx | 2 + Charts/Core/vtkChartMatrix.h | 2 + Charts/Core/vtkChartParallelCoordinates.cxx | 2 + Charts/Core/vtkChartParallelCoordinates.h | 2 + Charts/Core/vtkChartPie.cxx | 2 + Charts/Core/vtkChartPie.h | 2 + Charts/Core/vtkChartXY.cxx | 2 + Charts/Core/vtkChartXY.h | 4 + Charts/Core/vtkChartXYZ.cxx | 2 + Charts/Core/vtkChartXYZ.h | 2 + Charts/Core/vtkColorLegend.cxx | 2 + Charts/Core/vtkColorLegend.h | 2 + .../vtkColorTransferControlPointsItem.cxx | 2 + .../Core/vtkColorTransferControlPointsItem.h | 2 + Charts/Core/vtkColorTransferFunctionItem.cxx | 2 + Charts/Core/vtkColorTransferFunctionItem.h | 2 + Charts/Core/vtkCompositeControlPointsItem.cxx | 2 + Charts/Core/vtkCompositeControlPointsItem.h | 2 + .../Core/vtkCompositeTransferFunctionItem.cxx | 2 + .../Core/vtkCompositeTransferFunctionItem.h | 2 + Charts/Core/vtkContextArea.cxx | 2 + Charts/Core/vtkContextArea.h | 2 + Charts/Core/vtkContextPolygon.cxx | 2 + Charts/Core/vtkContextPolygon.h | 2 + Charts/Core/vtkControlPointsItem.cxx | 2 + Charts/Core/vtkControlPointsItem.h | 2 + Charts/Core/vtkInteractiveArea.cxx | 2 + Charts/Core/vtkInteractiveArea.h | 2 + Charts/Core/vtkLookupTableItem.cxx | 2 + Charts/Core/vtkLookupTableItem.h | 2 + Charts/Core/vtkPiecewiseControlPointsItem.cxx | 2 + Charts/Core/vtkPiecewiseControlPointsItem.h | 2 + Charts/Core/vtkPiecewiseFunctionItem.cxx | 2 + Charts/Core/vtkPiecewiseFunctionItem.h | 2 + Charts/Core/vtkPiecewisePointHandleItem.cxx | 2 + Charts/Core/vtkPiecewisePointHandleItem.h | 2 + Charts/Core/vtkPlot.cxx | 2 + Charts/Core/vtkPlot.h | 2 + Charts/Core/vtkPlot3D.cxx | 2 + Charts/Core/vtkPlot3D.h | 2 + Charts/Core/vtkPlotArea.cxx | 2 + Charts/Core/vtkPlotArea.h | 2 + Charts/Core/vtkPlotBag.cxx | 2 + Charts/Core/vtkPlotBag.h | 2 + Charts/Core/vtkPlotBar.cxx | 2 + Charts/Core/vtkPlotBar.h | 2 + Charts/Core/vtkPlotBarRangeHandlesItem.cxx | 2 + Charts/Core/vtkPlotBarRangeHandlesItem.h | 2 + Charts/Core/vtkPlotBox.cxx | 2 + Charts/Core/vtkPlotBox.h | 2 + Charts/Core/vtkPlotFunctionalBag.cxx | 2 + Charts/Core/vtkPlotFunctionalBag.h | 2 + Charts/Core/vtkPlotGrid.cxx | 2 + Charts/Core/vtkPlotGrid.h | 2 + Charts/Core/vtkPlotHistogram2D.cxx | 2 + Charts/Core/vtkPlotHistogram2D.h | 2 + Charts/Core/vtkPlotLine.cxx | 2 + Charts/Core/vtkPlotLine.h | 2 + Charts/Core/vtkPlotLine3D.cxx | 2 + Charts/Core/vtkPlotLine3D.h | 2 + Charts/Core/vtkPlotParallelCoordinates.cxx | 2 + Charts/Core/vtkPlotParallelCoordinates.h | 2 + Charts/Core/vtkPlotPie.cxx | 2 + Charts/Core/vtkPlotPie.h | 2 + Charts/Core/vtkPlotPoints.cxx | 2 + Charts/Core/vtkPlotPoints.h | 2 + Charts/Core/vtkPlotPoints3D.cxx | 2 + Charts/Core/vtkPlotPoints3D.h | 2 + Charts/Core/vtkPlotRangeHandlesItem.cxx | 2 + Charts/Core/vtkPlotRangeHandlesItem.h | 2 + Charts/Core/vtkPlotStacked.cxx | 2 + Charts/Core/vtkPlotStacked.h | 2 + Charts/Core/vtkPlotSurface.cxx | 2 + Charts/Core/vtkPlotSurface.h | 2 + Charts/Core/vtkRangeHandlesItem.cxx | 2 + Charts/Core/vtkRangeHandlesItem.h | 2 + Charts/Core/vtkScalarsToColorsItem.cxx | 2 + Charts/Core/vtkScalarsToColorsItem.h | 2 + Charts/Core/vtkScatterPlotMatrix.cxx | 2 + Charts/Core/vtkScatterPlotMatrix.h | 2 + Common/Archive/vtkBufferedArchiver.cxx | 2 + Common/Archive/vtkBufferedArchiver.h | 2 + Common/Archive/vtkPartitionedArchiver.cxx | 2 + Common/Archive/vtkPartitionedArchiver.h | 2 + Common/Color/vtkColorSeries.cxx | 2 + Common/Color/vtkColorSeries.h | 2 + Common/Color/vtkNamedColors.cxx | 2 + Common/Color/vtkNamedColors.h | 2 + .../vtkBilinearQuadIntersection.cxx | 2 + .../vtkBilinearQuadIntersection.h | 2 + .../vtkCardinalSpline.cxx | 2 + .../ComputationalGeometry/vtkCardinalSpline.h | 2 + .../vtkKochanekSpline.cxx | 2 + .../ComputationalGeometry/vtkKochanekSpline.h | 2 + .../vtkParametricBohemianDome.cxx | 2 + .../vtkParametricBohemianDome.h | 2 + .../vtkParametricBour.cxx | 2 + .../ComputationalGeometry/vtkParametricBour.h | 2 + .../vtkParametricBoy.cxx | 2 + .../ComputationalGeometry/vtkParametricBoy.h | 2 + .../vtkParametricCatalanMinimal.cxx | 2 + .../vtkParametricCatalanMinimal.h | 2 + .../vtkParametricConicSpiral.cxx | 2 + .../vtkParametricConicSpiral.h | 2 + .../vtkParametricCrossCap.cxx | 2 + .../vtkParametricCrossCap.h | 2 + .../vtkParametricDini.cxx | 2 + .../ComputationalGeometry/vtkParametricDini.h | 2 + .../vtkParametricEllipsoid.cxx | 2 + .../vtkParametricEllipsoid.h | 2 + .../vtkParametricEnneper.cxx | 2 + .../vtkParametricEnneper.h | 2 + .../vtkParametricFigure8Klein.cxx | 2 + .../vtkParametricFigure8Klein.h | 2 + .../vtkParametricFunction.cxx | 2 + .../vtkParametricFunction.h | 2 + .../vtkParametricHenneberg.cxx | 2 + .../vtkParametricHenneberg.h | 2 + .../vtkParametricKlein.cxx | 2 + .../vtkParametricKlein.h | 2 + .../vtkParametricKuen.cxx | 2 + .../ComputationalGeometry/vtkParametricKuen.h | 2 + .../vtkParametricMobius.cxx | 2 + .../vtkParametricMobius.h | 2 + .../vtkParametricPluckerConoid.cxx | 2 + .../vtkParametricPluckerConoid.h | 2 + .../vtkParametricPseudosphere.cxx | 2 + .../vtkParametricPseudosphere.h | 2 + .../vtkParametricRandomHills.cxx | 2 + .../vtkParametricRandomHills.h | 2 + .../vtkParametricRoman.cxx | 2 + .../vtkParametricRoman.h | 2 + .../vtkParametricSpline.cxx | 2 + .../vtkParametricSpline.h | 8 +- .../vtkParametricSuperEllipsoid.cxx | 2 + .../vtkParametricSuperEllipsoid.h | 2 + .../vtkParametricSuperToroid.cxx | 2 + .../vtkParametricSuperToroid.h | 2 + .../vtkParametricTorus.cxx | 2 + .../vtkParametricTorus.h | 2 + Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h | 2 + .../Common/vtkSMPThreadLocalImplAbstract.h | 2 + Common/Core/SMP/Common/vtkSMPToolsAPI.cxx | 2 + Common/Core/SMP/Common/vtkSMPToolsAPI.h | 2 + Common/Core/SMP/Common/vtkSMPToolsImpl.h | 3 +- Common/Core/SMP/Common/vtkSMPToolsInternal.h | 3 + .../SMP/OpenMP/vtkSMPThreadLocalBackend.cxx | 3 +- .../SMP/OpenMP/vtkSMPThreadLocalBackend.h | 2 + .../Core/SMP/OpenMP/vtkSMPThreadLocalImpl.h | 2 + Common/Core/SMP/OpenMP/vtkSMPToolsImpl.cxx | 2 + Common/Core/SMP/OpenMP/vtkSMPToolsImpl.txx | 2 + .../STDThread/vtkSMPThreadLocalBackend.cxx | 2 + .../SMP/STDThread/vtkSMPThreadLocalBackend.h | 2 + .../SMP/STDThread/vtkSMPThreadLocalImpl.h | 2 + .../Core/SMP/STDThread/vtkSMPThreadPool.cxx | 20 +- Common/Core/SMP/STDThread/vtkSMPThreadPool.h | 2 + Common/Core/SMP/STDThread/vtkSMPToolsImpl.cxx | 2 + Common/Core/SMP/STDThread/vtkSMPToolsImpl.txx | 2 + .../SMP/Sequential/vtkSMPThreadLocalImpl.h | 2 + .../Core/SMP/Sequential/vtkSMPToolsImpl.cxx | 2 + .../Core/SMP/Sequential/vtkSMPToolsImpl.txx | 2 + Common/Core/SMP/TBB/vtkSMPThreadLocalImpl.h | 2 + Common/Core/SMP/TBB/vtkSMPToolsImpl.cxx | 2 + Common/Core/SMP/TBB/vtkSMPToolsImpl.txx | 2 + .../Core/Testing/Cxx/TestArrayUserTypes.cxx | 3 + Common/Core/Testing/Cxx/vtkTestNewVar.h | 2 + Common/Core/vtkABI.h | 2 + Common/Core/vtkAOSDataArrayTemplate.h | 13 +- Common/Core/vtkAOSDataArrayTemplate.txx | 2 + Common/Core/vtkAbstractArray.cxx | 7 + Common/Core/vtkAbstractArray.h | 4 +- Common/Core/vtkAndroidOutputWindow.cxx | 2 + Common/Core/vtkAndroidOutputWindow.h | 2 + Common/Core/vtkAnimationCue.cxx | 2 + Common/Core/vtkAnimationCue.h | 2 + Common/Core/vtkArchiver.cxx | 2 + Common/Core/vtkArchiver.h | 2 + Common/Core/vtkArray.cxx | 2 + Common/Core/vtkArray.h | 2 + Common/Core/vtkArrayCoordinates.cxx | 2 + Common/Core/vtkArrayCoordinates.h | 2 + Common/Core/vtkArrayDispatch.h | 2 + Common/Core/vtkArrayDispatch.txx | 6 + Common/Core/vtkArrayExtents.cxx | 2 + Common/Core/vtkArrayExtents.h | 2 + Common/Core/vtkArrayExtentsList.cxx | 2 + Common/Core/vtkArrayExtentsList.h | 2 + Common/Core/vtkArrayInterpolate.h | 2 + Common/Core/vtkArrayInterpolate.txx | 2 + Common/Core/vtkArrayIterator.cxx | 2 + Common/Core/vtkArrayIterator.h | 2 + Common/Core/vtkArrayIteratorTemplate.h | 2 + Common/Core/vtkArrayIteratorTemplate.txx | 2 + .../vtkArrayIteratorTemplateInstantiate.cxx | 2 + Common/Core/vtkArrayPrint.h | 2 + Common/Core/vtkArrayPrint.txx | 2 + Common/Core/vtkArrayRange.cxx | 2 + Common/Core/vtkArrayRange.h | 2 + Common/Core/vtkArraySort.cxx | 2 + Common/Core/vtkArraySort.h | 2 + Common/Core/vtkArrayWeights.cxx | 2 + Common/Core/vtkArrayWeights.h | 2 + Common/Core/vtkAtomicMutex.cxx | 3 + Common/Core/vtkAtomicMutex.h | 3 + Common/Core/vtkAutoInit.h | 18 +- Common/Core/vtkBitArray.cxx | 2 + Common/Core/vtkBitArray.h | 2 + Common/Core/vtkBitArrayIterator.cxx | 2 + Common/Core/vtkBitArrayIterator.h | 2 + Common/Core/vtkBoxMuellerRandomSequence.cxx | 2 + Common/Core/vtkBoxMuellerRandomSequence.h | 2 + Common/Core/vtkBreakPoint.cxx | 2 + Common/Core/vtkBreakPoint.h | 2 + Common/Core/vtkBuffer.h | 2 + Common/Core/vtkByteSwap.cxx | 2 + Common/Core/vtkByteSwap.h | 2 + Common/Core/vtkCallbackCommand.cxx | 2 + Common/Core/vtkCallbackCommand.h | 2 + Common/Core/vtkCharArray.cxx | 2 + Common/Core/vtkCharArray.h | 2 + Common/Core/vtkCollection.cxx | 2 + Common/Core/vtkCollection.h | 2 + Common/Core/vtkCollectionIterator.cxx | 2 + Common/Core/vtkCollectionIterator.h | 2 + Common/Core/vtkCollectionRange.h | 2 + Common/Core/vtkCommand.cxx | 2 + Common/Core/vtkCommand.h | 2 + .../Core/vtkCommonInformationKeyManager.cxx | 2 + Common/Core/vtkCommonInformationKeyManager.h | 2 + .../vtkCreateArrayDispatchArrayList.cmake | 4 +- Common/Core/vtkCriticalSection.cxx | 2 + Common/Core/vtkCriticalSection.h | 2 + Common/Core/vtkDataArray.cxx | 7 + Common/Core/vtkDataArray.h | 4 + Common/Core/vtkDataArrayAccessor.h | 2 + Common/Core/vtkDataArrayCollection.cxx | 2 + Common/Core/vtkDataArrayCollection.h | 2 + .../Core/vtkDataArrayCollectionIterator.cxx | 2 + Common/Core/vtkDataArrayCollectionIterator.h | 2 + Common/Core/vtkDataArrayMeta.h | 14 + Common/Core/vtkDataArrayPrivate.txx | 2 + Common/Core/vtkDataArrayRange.h | 5 +- Common/Core/vtkDataArraySelection.cxx | 2 + Common/Core/vtkDataArraySelection.h | 2 + Common/Core/vtkDataArrayTupleRange_AOS.h | 3 +- Common/Core/vtkDataArrayTupleRange_Generic.h | 3 +- Common/Core/vtkDataArrayValueRange_AOS.h | 3 +- Common/Core/vtkDataArrayValueRange_Generic.h | 3 +- Common/Core/vtkDebugLeaks.cxx | 2 + Common/Core/vtkDebugLeaks.h | 2 + Common/Core/vtkDebugLeaksManager.cxx | 2 + Common/Core/vtkDebugLeaksManager.h | 2 + Common/Core/vtkDenseArray.h | 2 + Common/Core/vtkDenseArray.txx | 2 + Common/Core/vtkDoubleArray.cxx | 2 + Common/Core/vtkDoubleArray.h | 2 + Common/Core/vtkDynamicLoader.cxx | 2 + Common/Core/vtkDynamicLoader.h | 2 + Common/Core/vtkEventData.h | 2 + Common/Core/vtkEventForwarderCommand.cxx | 2 + Common/Core/vtkEventForwarderCommand.h | 2 + Common/Core/vtkFileOutputWindow.cxx | 2 + Common/Core/vtkFileOutputWindow.h | 2 + Common/Core/vtkFloatArray.cxx | 2 + Common/Core/vtkFloatArray.h | 2 + Common/Core/vtkFloatingPointExceptions.cxx | 2 + Common/Core/vtkFloatingPointExceptions.h | 2 + Common/Core/vtkGarbageCollector.cxx | 2 + Common/Core/vtkGarbageCollector.h | 2 + Common/Core/vtkGarbageCollectorManager.cxx | 2 + Common/Core/vtkGarbageCollectorManager.h | 2 + Common/Core/vtkGaussianRandomSequence.cxx | 2 + Common/Core/vtkGaussianRandomSequence.h | 2 + Common/Core/vtkGenericDataArray.cxx | 2 + Common/Core/vtkGenericDataArray.h | 12 + Common/Core/vtkGenericDataArray.txx | 10 + Common/Core/vtkGenericDataArrayLookupHelper.h | 8 +- ...nericDataArrayValueRangeInstantiate.cxx.in | 2 + Common/Core/vtkIdList.cxx | 2 + Common/Core/vtkIdList.h | 2 + Common/Core/vtkIdListCollection.cxx | 2 + Common/Core/vtkIdListCollection.h | 2 + Common/Core/vtkIdTypeArray.cxx | 2 + Common/Core/vtkIdTypeArray.h | 2 + Common/Core/vtkIndent.cxx | 2 + Common/Core/vtkIndent.h | 2 + Common/Core/vtkInformation.cxx | 2 + Common/Core/vtkInformation.h | 2 + Common/Core/vtkInformationDataObjectKey.cxx | 2 + Common/Core/vtkInformationDataObjectKey.h | 2 + Common/Core/vtkInformationDoubleKey.cxx | 2 + Common/Core/vtkInformationDoubleKey.h | 2 + Common/Core/vtkInformationDoubleVectorKey.cxx | 2 + Common/Core/vtkInformationDoubleVectorKey.h | 2 + Common/Core/vtkInformationIdTypeKey.cxx | 2 + Common/Core/vtkInformationIdTypeKey.h | 2 + Common/Core/vtkInformationInformationKey.cxx | 2 + Common/Core/vtkInformationInformationKey.h | 2 + .../vtkInformationInformationVectorKey.cxx | 2 + .../Core/vtkInformationInformationVectorKey.h | 2 + Common/Core/vtkInformationIntegerKey.cxx | 2 + Common/Core/vtkInformationIntegerKey.h | 2 + .../Core/vtkInformationIntegerPointerKey.cxx | 2 + Common/Core/vtkInformationIntegerPointerKey.h | 2 + .../Core/vtkInformationIntegerVectorKey.cxx | 2 + Common/Core/vtkInformationIntegerVectorKey.h | 2 + Common/Core/vtkInformationInternals.h | 2 + Common/Core/vtkInformationIterator.cxx | 2 + Common/Core/vtkInformationIterator.h | 2 + Common/Core/vtkInformationKey.cxx | 2 + Common/Core/vtkInformationKey.h | 2 + Common/Core/vtkInformationKeyLookup.cxx | 2 + Common/Core/vtkInformationKeyLookup.h | 2 + Common/Core/vtkInformationKeyVectorKey.cxx | 2 + Common/Core/vtkInformationKeyVectorKey.h | 2 + Common/Core/vtkInformationObjectBaseKey.cxx | 2 + Common/Core/vtkInformationObjectBaseKey.h | 2 + .../vtkInformationObjectBaseVectorKey.cxx | 2 + .../Core/vtkInformationObjectBaseVectorKey.h | 2 + Common/Core/vtkInformationRequestKey.cxx | 2 + Common/Core/vtkInformationRequestKey.h | 2 + Common/Core/vtkInformationStringKey.cxx | 2 + Common/Core/vtkInformationStringKey.h | 2 + Common/Core/vtkInformationStringVectorKey.cxx | 2 + Common/Core/vtkInformationStringVectorKey.h | 2 + Common/Core/vtkInformationUnsignedLongKey.cxx | 2 + Common/Core/vtkInformationUnsignedLongKey.h | 2 + Common/Core/vtkInformationVariantKey.cxx | 2 + Common/Core/vtkInformationVariantKey.h | 2 + .../Core/vtkInformationVariantVectorKey.cxx | 2 + Common/Core/vtkInformationVariantVectorKey.h | 2 + Common/Core/vtkInformationVector.cxx | 2 + Common/Core/vtkInformationVector.h | 2 + Common/Core/vtkIntArray.cxx | 2 + Common/Core/vtkIntArray.h | 2 + Common/Core/vtkLargeInteger.cxx | 2 + Common/Core/vtkLargeInteger.h | 2 + Common/Core/vtkLogger.cxx | 6 + Common/Core/vtkLogger.h | 2 + Common/Core/vtkLongArray.cxx | 2 + Common/Core/vtkLongArray.h | 2 + Common/Core/vtkLongLongArray.cxx | 2 + Common/Core/vtkLongLongArray.h | 2 + Common/Core/vtkLookupTable.cxx | 6 + Common/Core/vtkLookupTable.h | 2 + Common/Core/vtkMappedDataArray.h | 2 + Common/Core/vtkMappedDataArray.txx | 2 + Common/Core/vtkMath.cxx | 2 + Common/Core/vtkMath.h | 14 + Common/Core/vtkMathPrivate.hxx | 2 + Common/Core/vtkMathUtilities.h | 4 + Common/Core/vtkMatrixUtilities.h | 4 + Common/Core/vtkMersenneTwister.cxx | 2 + Common/Core/vtkMersenneTwister.h | 2 + Common/Core/vtkMersenneTwister_Private.cxx | 4 + Common/Core/vtkMeta.h | 6 + .../Core/vtkMinimalStandardRandomSequence.cxx | 2 + .../Core/vtkMinimalStandardRandomSequence.h | 2 + Common/Core/vtkMultiThreader.cxx | 4 + Common/Core/vtkMultiThreader.h | 2 + Common/Core/vtkNew.h | 2 + Common/Core/vtkOStrStreamWrapper.cxx | 2 + Common/Core/vtkOStrStreamWrapper.h | 2 + Common/Core/vtkOStreamWrapper.cxx | 2 + Common/Core/vtkOStreamWrapper.h | 2 + Common/Core/vtkObject.cxx | 2 + Common/Core/vtkObject.h | 2 + Common/Core/vtkObjectBase.cxx | 6 + Common/Core/vtkObjectBase.h | 2 + Common/Core/vtkObjectFactory.cxx | 2 + Common/Core/vtkObjectFactory.h | 2 + Common/Core/vtkObjectFactoryCollection.cxx | 2 + Common/Core/vtkObjectFactoryCollection.h | 2 + Common/Core/vtkOldStyleCallbackCommand.cxx | 2 + Common/Core/vtkOldStyleCallbackCommand.h | 2 + Common/Core/vtkOutputWindow.cxx | 2 + Common/Core/vtkOutputWindow.h | 2 + Common/Core/vtkOverrideInformation.cxx | 2 + Common/Core/vtkOverrideInformation.h | 2 + .../Core/vtkOverrideInformationCollection.cxx | 2 + .../Core/vtkOverrideInformationCollection.h | 2 + Common/Core/vtkPoints.cxx | 2 + Common/Core/vtkPoints.h | 2 + Common/Core/vtkPoints2D.cxx | 2 + Common/Core/vtkPoints2D.h | 2 + Common/Core/vtkPriorityQueue.cxx | 2 + Common/Core/vtkPriorityQueue.h | 2 + Common/Core/vtkRandomPool.cxx | 5 + Common/Core/vtkRandomPool.h | 2 + Common/Core/vtkRandomSequence.cxx | 2 + Common/Core/vtkRandomSequence.h | 2 + Common/Core/vtkRange.h | 2 + Common/Core/vtkRangeIterableTraits.h | 6 + Common/Core/vtkReferenceCount.cxx | 2 + Common/Core/vtkReferenceCount.h | 2 + Common/Core/vtkSMPThreadLocal.h | 2 + Common/Core/vtkSMPThreadLocalObject.h | 2 + Common/Core/vtkSMPTools.cxx | 2 + Common/Core/vtkSMPTools.h | 4 + Common/Core/vtkSOADataArrayTemplate.h | 12 +- Common/Core/vtkSOADataArrayTemplate.txx | 2 + Common/Core/vtkScalarsToColors.cxx | 4 + Common/Core/vtkScalarsToColors.h | 2 + Common/Core/vtkScaledSOADataArrayTemplate.h | 12 +- Common/Core/vtkScaledSOADataArrayTemplate.txx | 2 + Common/Core/vtkSetGet.h | 2 + Common/Core/vtkShortArray.cxx | 2 + Common/Core/vtkShortArray.h | 2 + Common/Core/vtkSignedCharArray.cxx | 2 + Common/Core/vtkSignedCharArray.h | 2 + Common/Core/vtkSmartPointer.h | 6 + Common/Core/vtkSmartPointerBase.cxx | 2 + Common/Core/vtkSmartPointerBase.h | 2 + Common/Core/vtkSortDataArray.cxx | 4 + Common/Core/vtkSortDataArray.h | 2 + Common/Core/vtkSparseArray.h | 2 + Common/Core/vtkSparseArray.txx | 2 + Common/Core/vtkStdString.cxx | 2 + Common/Core/vtkStdString.h | 2 + Common/Core/vtkStringArray.cxx | 2 + Common/Core/vtkStringArray.h | 2 + Common/Core/vtkStringOutputWindow.cxx | 2 + Common/Core/vtkStringOutputWindow.h | 2 + Common/Core/vtkTestDataArray.h | 2 + Common/Core/vtkTimePointUtility.cxx | 2 + Common/Core/vtkTimePointUtility.h | 2 + Common/Core/vtkTimeStamp.cxx | 2 + Common/Core/vtkTimeStamp.h | 2 + Common/Core/vtkType.h | 3 + Common/Core/vtkTypeList.h | 5 + Common/Core/vtkTypeList.txx | 6 +- Common/Core/vtkTypeTraits.h | 2 + Common/Core/vtkTypedArray.cxx.in | 2 + Common/Core/vtkTypedArray.h | 2 + Common/Core/vtkTypedArray.h.in | 6 + Common/Core/vtkTypedArray.txx | 2 + Common/Core/vtkTypedDataArray.h | 4 + Common/Core/vtkTypedDataArray.txx | 2 + Common/Core/vtkTypedDataArrayIterator.h | 2 + Common/Core/vtkUnsignedCharArray.cxx | 2 + Common/Core/vtkUnsignedCharArray.h | 2 + Common/Core/vtkUnsignedIntArray.cxx | 2 + Common/Core/vtkUnsignedIntArray.h | 2 + Common/Core/vtkUnsignedLongArray.cxx | 2 + Common/Core/vtkUnsignedLongArray.h | 2 + Common/Core/vtkUnsignedLongLongArray.cxx | 2 + Common/Core/vtkUnsignedLongLongArray.h | 2 + Common/Core/vtkUnsignedShortArray.cxx | 2 + Common/Core/vtkUnsignedShortArray.h | 2 + Common/Core/vtkVTK_USE_SCALED_SOA_ARRAYS.h.in | 5 + Common/Core/vtkVariant.cxx | 6 + Common/Core/vtkVariant.h | 4 + Common/Core/vtkVariantArray.cxx | 2 + Common/Core/vtkVariantArray.h | 6 +- Common/Core/vtkVariantCast.h | 2 + Common/Core/vtkVariantCreate.h | 2 + Common/Core/vtkVariantExtract.h | 2 + Common/Core/vtkVariantInlineOperators.h | 4 + Common/Core/vtkVariantToNumeric.cxx | 2 + Common/Core/vtkVersion.cxx | 2 + Common/Core/vtkVersion.h | 2 + Common/Core/vtkVoidArray.cxx | 2 + Common/Core/vtkVoidArray.h | 2 + Common/Core/vtkWeakPointer.h | 7 + Common/Core/vtkWeakPointerBase.cxx | 2 + Common/Core/vtkWeakPointerBase.h | 2 + Common/Core/vtkWeakReference.cxx | 2 + Common/Core/vtkWeakReference.h | 2 + Common/Core/vtkWin32OutputWindow.cxx | 2 + Common/Core/vtkWin32OutputWindow.h | 2 + Common/Core/vtkWin32ProcessOutputWindow.cxx | 2 + Common/Core/vtkWin32ProcessOutputWindow.h | 2 + Common/Core/vtkWindow.cxx | 2 + Common/Core/vtkWindow.h | 2 + Common/Core/vtkXMLFileOutputWindow.cxx | 2 + Common/Core/vtkXMLFileOutputWindow.h | 2 + Common/DataModel/vtkAMRBox.cxx | 2 + Common/DataModel/vtkAMRBox.h | 2 + Common/DataModel/vtkAMRDataInternals.cxx | 2 + Common/DataModel/vtkAMRDataInternals.h | 2 + Common/DataModel/vtkAMRInformation.cxx | 2 + Common/DataModel/vtkAMRInformation.h | 2 + Common/DataModel/vtkAMRUtilities.cxx | 2 + Common/DataModel/vtkAMRUtilities.h | 2 + Common/DataModel/vtkAbstractCellLinks.cxx | 2 + Common/DataModel/vtkAbstractCellLinks.h | 2 + Common/DataModel/vtkAbstractCellLocator.cxx | 2 + Common/DataModel/vtkAbstractCellLocator.h | 2 + .../DataModel/vtkAbstractElectronicData.cxx | 2 + Common/DataModel/vtkAbstractElectronicData.h | 2 + Common/DataModel/vtkAbstractPointLocator.cxx | 2 + Common/DataModel/vtkAbstractPointLocator.h | 2 + .../DataModel/vtkAdjacentVertexIterator.cxx | 2 + Common/DataModel/vtkAdjacentVertexIterator.h | 2 + .../DataModel/vtkAngularPeriodicDataArray.h | 2 + .../DataModel/vtkAngularPeriodicDataArray.txx | 2 + Common/DataModel/vtkAnimationScene.cxx | 2 + Common/DataModel/vtkAnimationScene.h | 2 + Common/DataModel/vtkAnnotation.cxx | 2 + Common/DataModel/vtkAnnotation.h | 2 + Common/DataModel/vtkAnnotationLayers.cxx | 2 + Common/DataModel/vtkAnnotationLayers.h | 2 + Common/DataModel/vtkArrayData.cxx | 2 + Common/DataModel/vtkArrayData.h | 2 + Common/DataModel/vtkArrayListTemplate.h | 2 + Common/DataModel/vtkArrayListTemplate.txx | 2 + Common/DataModel/vtkAtom.cxx | 2 + Common/DataModel/vtkAtom.h | 2 + Common/DataModel/vtkAttributesErrorMetric.cxx | 2 + Common/DataModel/vtkAttributesErrorMetric.h | 2 + Common/DataModel/vtkBSPCuts.cxx | 2 + Common/DataModel/vtkBSPCuts.h | 2 + Common/DataModel/vtkBSPIntersections.cxx | 2 + Common/DataModel/vtkBSPIntersections.h | 2 + Common/DataModel/vtkBezierCurve.cxx | 2 + Common/DataModel/vtkBezierCurve.h | 2 + Common/DataModel/vtkBezierHexahedron.cxx | 2 + Common/DataModel/vtkBezierHexahedron.h | 2 + Common/DataModel/vtkBezierInterpolation.cxx | 2 + Common/DataModel/vtkBezierInterpolation.h | 2 + Common/DataModel/vtkBezierQuadrilateral.cxx | 2 + Common/DataModel/vtkBezierQuadrilateral.h | 2 + Common/DataModel/vtkBezierTetra.cxx | 2 + Common/DataModel/vtkBezierTetra.h | 2 + Common/DataModel/vtkBezierTriangle.cxx | 2 + Common/DataModel/vtkBezierTriangle.h | 2 + Common/DataModel/vtkBezierWedge.cxx | 2 + Common/DataModel/vtkBezierWedge.h | 2 + Common/DataModel/vtkBiQuadraticQuad.cxx | 2 + Common/DataModel/vtkBiQuadraticQuad.h | 2 + .../vtkBiQuadraticQuadraticHexahedron.cxx | 2 + .../vtkBiQuadraticQuadraticHexahedron.h | 2 + .../vtkBiQuadraticQuadraticWedge.cxx | 2 + .../DataModel/vtkBiQuadraticQuadraticWedge.h | 2 + Common/DataModel/vtkBiQuadraticTriangle.cxx | 2 + Common/DataModel/vtkBiQuadraticTriangle.h | 2 + Common/DataModel/vtkBond.cxx | 2 + Common/DataModel/vtkBond.h | 2 + Common/DataModel/vtkBoundingBox.cxx | 2 + Common/DataModel/vtkBoundingBox.h | 2 + Common/DataModel/vtkBox.cxx | 2 + Common/DataModel/vtkBox.h | 2 + Common/DataModel/vtkCell.cxx | 2 + Common/DataModel/vtkCell.h | 2 + Common/DataModel/vtkCell3D.cxx | 2 + Common/DataModel/vtkCell3D.h | 2 + Common/DataModel/vtkCellArray.cxx | 5 + Common/DataModel/vtkCellArray.h | 6 + Common/DataModel/vtkCellArrayIterator.cxx | 2 + Common/DataModel/vtkCellArrayIterator.h | 2 + Common/DataModel/vtkCellData.cxx | 2 + Common/DataModel/vtkCellData.h | 2 + Common/DataModel/vtkCellIterator.cxx | 2 + Common/DataModel/vtkCellIterator.h | 2 + Common/DataModel/vtkCellLinks.cxx | 2 + Common/DataModel/vtkCellLinks.h | 2 + Common/DataModel/vtkCellLocator.cxx | 2 + Common/DataModel/vtkCellLocator.h | 2 + Common/DataModel/vtkCellLocatorStrategy.cxx | 2 + Common/DataModel/vtkCellLocatorStrategy.h | 2 + Common/DataModel/vtkCellTreeLocator.cxx | 6 + Common/DataModel/vtkCellTreeLocator.h | 4 + Common/DataModel/vtkCellType.h | 4 + Common/DataModel/vtkCellTypes.cxx | 2 + Common/DataModel/vtkCellTypes.h | 2 + .../DataModel/vtkClosestNPointsStrategy.cxx | 2 + Common/DataModel/vtkClosestNPointsStrategy.h | 2 + Common/DataModel/vtkClosestPointStrategy.cxx | 2 + Common/DataModel/vtkClosestPointStrategy.h | 2 + Common/DataModel/vtkColor.h | 2 + Common/DataModel/vtkCompositeDataIterator.cxx | 2 + Common/DataModel/vtkCompositeDataIterator.h | 2 + Common/DataModel/vtkCompositeDataSet.cxx | 2 + Common/DataModel/vtkCompositeDataSet.h | 2 + Common/DataModel/vtkCompositeDataSet.txx | 2 + .../vtkCompositeDataSetNodeReference.h | 6 +- Common/DataModel/vtkCompositeDataSetRange.h | 7 +- Common/DataModel/vtkCone.cxx | 2 + Common/DataModel/vtkCone.h | 2 + Common/DataModel/vtkConvexPointSet.cxx | 2 + Common/DataModel/vtkConvexPointSet.h | 2 + Common/DataModel/vtkCoordinateFrame.cxx | 2 + Common/DataModel/vtkCoordinateFrame.h | 2 + Common/DataModel/vtkCubicLine.cxx | 2 + Common/DataModel/vtkCubicLine.h | 2 + Common/DataModel/vtkCylinder.cxx | 2 + Common/DataModel/vtkCylinder.h | 2 + Common/DataModel/vtkDataAssembly.cxx | 2 + Common/DataModel/vtkDataAssembly.h | 2 + Common/DataModel/vtkDataAssemblyUtilities.cxx | 2 + Common/DataModel/vtkDataAssemblyUtilities.h | 2 + Common/DataModel/vtkDataAssemblyVisitor.h | 2 + Common/DataModel/vtkDataObject.cxx | 2 + Common/DataModel/vtkDataObject.h | 2 + Common/DataModel/vtkDataObjectCollection.cxx | 2 + Common/DataModel/vtkDataObjectCollection.h | 2 + Common/DataModel/vtkDataObjectTree.cxx | 2 + Common/DataModel/vtkDataObjectTree.h | 2 + Common/DataModel/vtkDataObjectTreeInternals.h | 2 + .../DataModel/vtkDataObjectTreeIterator.cxx | 2 + Common/DataModel/vtkDataObjectTreeIterator.h | 2 + Common/DataModel/vtkDataObjectTreeRange.h | 7 +- Common/DataModel/vtkDataObjectTypes.cxx | 2 + Common/DataModel/vtkDataObjectTypes.h | 2 + Common/DataModel/vtkDataSet.cxx | 2 + Common/DataModel/vtkDataSet.h | 2 + Common/DataModel/vtkDataSetAttributes.cxx | 2 + Common/DataModel/vtkDataSetAttributes.h | 2 + .../vtkDataSetAttributesFieldList.cxx | 5 + .../DataModel/vtkDataSetAttributesFieldList.h | 2 + Common/DataModel/vtkDataSetCellIterator.cxx | 2 + Common/DataModel/vtkDataSetCellIterator.h | 2 + Common/DataModel/vtkDataSetCollection.cxx | 2 + Common/DataModel/vtkDataSetCollection.h | 2 + Common/DataModel/vtkDirectedAcyclicGraph.cxx | 2 + Common/DataModel/vtkDirectedAcyclicGraph.h | 2 + Common/DataModel/vtkDirectedGraph.cxx | 2 + Common/DataModel/vtkDirectedGraph.h | 2 + .../DataModel/vtkDistributedGraphHelper.cxx | 2 + Common/DataModel/vtkDistributedGraphHelper.h | 2 + Common/DataModel/vtkEdgeListIterator.cxx | 2 + Common/DataModel/vtkEdgeListIterator.h | 2 + Common/DataModel/vtkEdgeTable.cxx | 2 + Common/DataModel/vtkEdgeTable.h | 2 + Common/DataModel/vtkEmptyCell.cxx | 2 + Common/DataModel/vtkEmptyCell.h | 2 + .../DataModel/vtkExplicitStructuredGrid.cxx | 2 + Common/DataModel/vtkExplicitStructuredGrid.h | 2 + .../vtkExtractStructuredGridHelper.cxx | 6 + .../vtkExtractStructuredGridHelper.h | 6 + Common/DataModel/vtkFieldData.cxx | 2 + Common/DataModel/vtkFieldData.h | 4 +- Common/DataModel/vtkFindCellStrategy.cxx | 2 + Common/DataModel/vtkFindCellStrategy.h | 2 + Common/DataModel/vtkGenericAdaptorCell.cxx | 2 + Common/DataModel/vtkGenericAdaptorCell.h | 2 + Common/DataModel/vtkGenericAttribute.cxx | 2 + Common/DataModel/vtkGenericAttribute.h | 2 + .../vtkGenericAttributeCollection.cxx | 2 + .../DataModel/vtkGenericAttributeCollection.h | 2 + Common/DataModel/vtkGenericCell.cxx | 2 + Common/DataModel/vtkGenericCell.h | 2 + Common/DataModel/vtkGenericCellIterator.cxx | 2 + Common/DataModel/vtkGenericCellIterator.h | 2 + .../DataModel/vtkGenericCellTessellator.cxx | 2 + Common/DataModel/vtkGenericCellTessellator.h | 2 + Common/DataModel/vtkGenericDataSet.cxx | 2 + Common/DataModel/vtkGenericDataSet.h | 2 + Common/DataModel/vtkGenericEdgeTable.cxx | 2 + Common/DataModel/vtkGenericEdgeTable.h | 2 + .../vtkGenericInterpolatedVelocityField.cxx | 2 + .../vtkGenericInterpolatedVelocityField.h | 2 + Common/DataModel/vtkGenericPointIterator.cxx | 2 + Common/DataModel/vtkGenericPointIterator.h | 2 + .../vtkGenericSubdivisionErrorMetric.cxx | 2 + .../vtkGenericSubdivisionErrorMetric.h | 2 + Common/DataModel/vtkGeometricErrorMetric.cxx | 2 + Common/DataModel/vtkGeometricErrorMetric.h | 2 + Common/DataModel/vtkGraph.cxx | 2 + Common/DataModel/vtkGraph.h | 20 +- Common/DataModel/vtkGraphEdge.cxx | 2 + Common/DataModel/vtkGraphEdge.h | 2 + Common/DataModel/vtkGraphInternals.cxx | 2 + Common/DataModel/vtkGraphInternals.h | 2 + Common/DataModel/vtkHexagonalPrism.cxx | 2 + Common/DataModel/vtkHexagonalPrism.h | 2 + Common/DataModel/vtkHexahedron.cxx | 4 + Common/DataModel/vtkHexahedron.h | 2 + .../vtkHierarchicalBoxDataIterator.cxx | 2 + .../vtkHierarchicalBoxDataIterator.h | 2 + .../DataModel/vtkHierarchicalBoxDataSet.cxx | 2 + Common/DataModel/vtkHierarchicalBoxDataSet.h | 2 + Common/DataModel/vtkHigherOrderCurve.cxx | 2 + Common/DataModel/vtkHigherOrderCurve.h | 2 + Common/DataModel/vtkHigherOrderHexahedron.cxx | 2 + Common/DataModel/vtkHigherOrderHexahedron.h | 2 + .../DataModel/vtkHigherOrderInterpolation.cxx | 2 + .../DataModel/vtkHigherOrderInterpolation.h | 2 + .../DataModel/vtkHigherOrderQuadrilateral.cxx | 2 + .../DataModel/vtkHigherOrderQuadrilateral.h | 2 + Common/DataModel/vtkHigherOrderTetra.cxx | 2 + Common/DataModel/vtkHigherOrderTetra.h | 2 + Common/DataModel/vtkHigherOrderTriangle.cxx | 2 + Common/DataModel/vtkHigherOrderTriangle.h | 2 + Common/DataModel/vtkHigherOrderWedge.cxx | 4 + Common/DataModel/vtkHigherOrderWedge.h | 2 + Common/DataModel/vtkHyperTree.cxx | 2 + Common/DataModel/vtkHyperTree.h | 2 + Common/DataModel/vtkHyperTreeCursor.cxx | 2 + Common/DataModel/vtkHyperTreeCursor.h | 2 + Common/DataModel/vtkHyperTreeGrid.cxx | 2 + Common/DataModel/vtkHyperTreeGrid.h | 2 + Common/DataModel/vtkHyperTreeGridEntry.cxx | 2 + Common/DataModel/vtkHyperTreeGridEntry.h | 2 + .../vtkHyperTreeGridGeometricLocator.cxx | 2 + .../vtkHyperTreeGridGeometricLocator.h | 3 + .../vtkHyperTreeGridGeometryEntry.cxx | 2 + .../DataModel/vtkHyperTreeGridGeometryEntry.h | 2 + .../vtkHyperTreeGridGeometryLevelEntry.cxx | 2 + .../vtkHyperTreeGridGeometryLevelEntry.h | 2 + ...vtkHyperTreeGridGeometryUnlimitedEntry.cxx | 2 + .../vtkHyperTreeGridGeometryUnlimitedEntry.h | 2 + ...perTreeGridGeometryUnlimitedLevelEntry.cxx | 2 + ...HyperTreeGridGeometryUnlimitedLevelEntry.h | 2 + .../DataModel/vtkHyperTreeGridLevelEntry.cxx | 2 + Common/DataModel/vtkHyperTreeGridLevelEntry.h | 2 + Common/DataModel/vtkHyperTreeGridLocator.cxx | 2 + Common/DataModel/vtkHyperTreeGridLocator.h | 3 + .../vtkHyperTreeGridNonOrientedCursor.cxx | 2 + .../vtkHyperTreeGridNonOrientedCursor.h | 2 + ...HyperTreeGridNonOrientedGeometryCursor.cxx | 2 + ...tkHyperTreeGridNonOrientedGeometryCursor.h | 2 + ...perTreeGridNonOrientedMooreSuperCursor.cxx | 4 + ...HyperTreeGridNonOrientedMooreSuperCursor.h | 2 + ...rTreeGridNonOrientedMooreSuperCursorData.h | 3 + ...eeGridNonOrientedMooreSuperCursorLight.cxx | 4 + ...TreeGridNonOrientedMooreSuperCursorLight.h | 2 + ...vtkHyperTreeGridNonOrientedSuperCursor.cxx | 2 + .../vtkHyperTreeGridNonOrientedSuperCursor.h | 2 + ...perTreeGridNonOrientedSuperCursorLight.cxx | 2 + ...HyperTreeGridNonOrientedSuperCursorLight.h | 2 + ...GridNonOrientedUnlimitedGeometryCursor.cxx | 2 + ...eeGridNonOrientedUnlimitedGeometryCursor.h | 2 + ...idNonOrientedUnlimitedMooreSuperCursor.cxx | 2 + ...GridNonOrientedUnlimitedMooreSuperCursor.h | 2 + ...reeGridNonOrientedUnlimitedSuperCursor.cxx | 2 + ...rTreeGridNonOrientedUnlimitedSuperCursor.h | 2 + ...eeGridNonOrientedVonNeumannSuperCursor.cxx | 4 + ...TreeGridNonOrientedVonNeumannSuperCursor.h | 2 + ...GridNonOrientedVonNeumannSuperCursorData.h | 2 + ...dNonOrientedVonNeumannSuperCursorLight.cxx | 4 + ...ridNonOrientedVonNeumannSuperCursorLight.h | 2 + .../vtkHyperTreeGridOrientedCursor.cxx | 2 + .../vtkHyperTreeGridOrientedCursor.h | 2 + ...vtkHyperTreeGridOrientedGeometryCursor.cxx | 2 + .../vtkHyperTreeGridOrientedGeometryCursor.h | 2 + Common/DataModel/vtkHyperTreeGridScales.h | 4 + Common/DataModel/vtkHyperTreeGridTools.h | 4 + Common/DataModel/vtkImageData.cxx | 2 + Common/DataModel/vtkImageData.h | 2 + Common/DataModel/vtkImageIterator.cxx | 2 + Common/DataModel/vtkImageIterator.h | 2 + Common/DataModel/vtkImageIterator.txx | 2 + Common/DataModel/vtkImageTransform.cxx | 2 + Common/DataModel/vtkImageTransform.h | 2 + Common/DataModel/vtkImplicitBoolean.cxx | 2 + Common/DataModel/vtkImplicitBoolean.h | 2 + Common/DataModel/vtkImplicitDataSet.cxx | 2 + Common/DataModel/vtkImplicitDataSet.h | 2 + Common/DataModel/vtkImplicitFunction.cxx | 2 + Common/DataModel/vtkImplicitFunction.h | 2 + .../vtkImplicitFunctionCollection.cxx | 2 + .../DataModel/vtkImplicitFunctionCollection.h | 2 + Common/DataModel/vtkImplicitHalo.cxx | 2 + Common/DataModel/vtkImplicitHalo.h | 2 + Common/DataModel/vtkImplicitSelectionLoop.cxx | 2 + Common/DataModel/vtkImplicitSelectionLoop.h | 2 + Common/DataModel/vtkImplicitSum.cxx | 2 + Common/DataModel/vtkImplicitSum.h | 2 + Common/DataModel/vtkImplicitVolume.cxx | 2 + Common/DataModel/vtkImplicitVolume.h | 2 + .../DataModel/vtkImplicitWindowFunction.cxx | 2 + Common/DataModel/vtkImplicitWindowFunction.h | 2 + Common/DataModel/vtkInEdgeIterator.cxx | 2 + Common/DataModel/vtkInEdgeIterator.h | 2 + Common/DataModel/vtkIncrementalOctreeNode.cxx | 2 + Common/DataModel/vtkIncrementalOctreeNode.h | 2 + .../vtkIncrementalOctreePointLocator.cxx | 2 + .../vtkIncrementalOctreePointLocator.h | 2 + .../DataModel/vtkIncrementalPointLocator.cxx | 2 + Common/DataModel/vtkIncrementalPointLocator.h | 2 + ...ionQuadratureSchemeDefinitionVectorKey.cxx | 2 + ...ationQuadratureSchemeDefinitionVectorKey.h | 2 + Common/DataModel/vtkIntersectionCounter.h | 2 + .../vtkIterativeClosestPointTransform.cxx | 2 + .../vtkIterativeClosestPointTransform.h | 2 + Common/DataModel/vtkKdNode.cxx | 2 + Common/DataModel/vtkKdNode.h | 2 + Common/DataModel/vtkKdTree.cxx | 2 + Common/DataModel/vtkKdTree.h | 2 + Common/DataModel/vtkKdTreePointLocator.cxx | 2 + Common/DataModel/vtkKdTreePointLocator.h | 2 + Common/DataModel/vtkLabelMapLookup.h | 4 + Common/DataModel/vtkLagrangeCurve.cxx | 2 + Common/DataModel/vtkLagrangeCurve.h | 2 + Common/DataModel/vtkLagrangeHexahedron.cxx | 2 + Common/DataModel/vtkLagrangeHexahedron.h | 2 + Common/DataModel/vtkLagrangeInterpolation.cxx | 2 + Common/DataModel/vtkLagrangeInterpolation.h | 2 + Common/DataModel/vtkLagrangeQuadrilateral.cxx | 2 + Common/DataModel/vtkLagrangeQuadrilateral.h | 2 + Common/DataModel/vtkLagrangeTetra.cxx | 2 + Common/DataModel/vtkLagrangeTetra.h | 2 + Common/DataModel/vtkLagrangeTriangle.cxx | 2 + Common/DataModel/vtkLagrangeTriangle.h | 2 + Common/DataModel/vtkLagrangeWedge.cxx | 2 + Common/DataModel/vtkLagrangeWedge.h | 2 + Common/DataModel/vtkLine.cxx | 2 + Common/DataModel/vtkLine.h | 3 + Common/DataModel/vtkLocator.cxx | 2 + Common/DataModel/vtkLocator.h | 2 + Common/DataModel/vtkMappedUnstructuredGrid.h | 2 + .../DataModel/vtkMappedUnstructuredGrid.txx | 2 + .../vtkMappedUnstructuredGridCellIterator.h | 2 + .../vtkMappedUnstructuredGridCellIterator.txx | 2 + .../vtkMarchingCubesPolygonCases.cxx | 2 + .../DataModel/vtkMarchingCubesPolygonCases.h | 2 + .../vtkMarchingCubesTriangleCases.cxx | 2 + .../DataModel/vtkMarchingCubesTriangleCases.h | 2 + .../DataModel/vtkMarchingSquaresLineCases.cxx | 2 + .../DataModel/vtkMarchingSquaresLineCases.h | 2 + .../vtkMeanValueCoordinatesInterpolator.cxx | 2 + .../vtkMeanValueCoordinatesInterpolator.h | 2 + Common/DataModel/vtkMergePoints.cxx | 2 + Common/DataModel/vtkMergePoints.h | 2 + Common/DataModel/vtkMolecule.cxx | 2 + Common/DataModel/vtkMolecule.h | 2 + Common/DataModel/vtkMultiBlockDataSet.cxx | 2 + Common/DataModel/vtkMultiBlockDataSet.h | 2 + Common/DataModel/vtkMultiPieceDataSet.cxx | 2 + Common/DataModel/vtkMultiPieceDataSet.h | 2 + Common/DataModel/vtkMutableDirectedGraph.cxx | 2 + Common/DataModel/vtkMutableDirectedGraph.h | 2 + .../DataModel/vtkMutableUndirectedGraph.cxx | 2 + Common/DataModel/vtkMutableUndirectedGraph.h | 2 + Common/DataModel/vtkNonLinearCell.cxx | 2 + Common/DataModel/vtkNonLinearCell.h | 2 + .../DataModel/vtkNonMergingPointLocator.cxx | 2 + Common/DataModel/vtkNonMergingPointLocator.h | 2 + Common/DataModel/vtkNonOverlappingAMR.cxx | 2 + Common/DataModel/vtkNonOverlappingAMR.h | 2 + Common/DataModel/vtkOctreePointLocator.cxx | 2 + Common/DataModel/vtkOctreePointLocator.h | 2 + .../DataModel/vtkOctreePointLocatorNode.cxx | 2 + Common/DataModel/vtkOctreePointLocatorNode.h | 2 + Common/DataModel/vtkOrderedTriangulator.cxx | 4 + Common/DataModel/vtkOrderedTriangulator.h | 2 + Common/DataModel/vtkOutEdgeIterator.cxx | 2 + Common/DataModel/vtkOutEdgeIterator.h | 2 + Common/DataModel/vtkOverlappingAMR.cxx | 2 + Common/DataModel/vtkOverlappingAMR.h | 2 + Common/DataModel/vtkPartitionedDataSet.cxx | 2 + Common/DataModel/vtkPartitionedDataSet.h | 2 + .../vtkPartitionedDataSetCollection.cxx | 2 + .../vtkPartitionedDataSetCollection.h | 2 + Common/DataModel/vtkPath.cxx | 2 + Common/DataModel/vtkPath.h | 2 + Common/DataModel/vtkPentagonalPrism.cxx | 2 + Common/DataModel/vtkPentagonalPrism.h | 2 + Common/DataModel/vtkPeriodicDataArray.h | 2 + Common/DataModel/vtkPeriodicDataArray.txx | 2 + Common/DataModel/vtkPerlinNoise.cxx | 2 + Common/DataModel/vtkPerlinNoise.h | 2 + Common/DataModel/vtkPiecewiseFunction.cxx | 2 + Common/DataModel/vtkPiecewiseFunction.h | 2 + Common/DataModel/vtkPixel.cxx | 4 + Common/DataModel/vtkPixel.h | 2 + Common/DataModel/vtkPixelExtent.cxx | 2 + Common/DataModel/vtkPixelExtent.h | 2 + Common/DataModel/vtkPixelTransfer.cxx | 2 + Common/DataModel/vtkPixelTransfer.h | 2 + Common/DataModel/vtkPlane.cxx | 2 + Common/DataModel/vtkPlane.h | 2 + Common/DataModel/vtkPlaneCollection.cxx | 2 + Common/DataModel/vtkPlaneCollection.h | 2 + Common/DataModel/vtkPlanes.cxx | 2 + Common/DataModel/vtkPlanes.h | 2 + Common/DataModel/vtkPlanesIntersection.cxx | 2 + Common/DataModel/vtkPlanesIntersection.h | 2 + Common/DataModel/vtkPointData.cxx | 2 + Common/DataModel/vtkPointData.h | 2 + Common/DataModel/vtkPointLocator.cxx | 2 + Common/DataModel/vtkPointLocator.h | 2 + Common/DataModel/vtkPointSet.cxx | 2 + Common/DataModel/vtkPointSet.h | 2 + Common/DataModel/vtkPointSetCellIterator.cxx | 2 + Common/DataModel/vtkPointSetCellIterator.h | 2 + Common/DataModel/vtkPointsProjectedHull.cxx | 6 + Common/DataModel/vtkPointsProjectedHull.h | 2 + Common/DataModel/vtkPolyData.cxx | 7 + Common/DataModel/vtkPolyData.h | 2 + Common/DataModel/vtkPolyDataCollection.cxx | 2 + Common/DataModel/vtkPolyDataCollection.h | 2 + Common/DataModel/vtkPolyDataInternals.h | 2 + Common/DataModel/vtkPolyLine.cxx | 2 + Common/DataModel/vtkPolyLine.h | 2 + Common/DataModel/vtkPolyPlane.cxx | 2 + Common/DataModel/vtkPolyPlane.h | 2 + Common/DataModel/vtkPolyVertex.cxx | 2 + Common/DataModel/vtkPolyVertex.h | 2 + Common/DataModel/vtkPolygon.cxx | 2 + Common/DataModel/vtkPolygon.h | 2 + Common/DataModel/vtkPolyhedron.cxx | 2 + Common/DataModel/vtkPolyhedron.h | 2 + Common/DataModel/vtkPyramid.cxx | 2 + Common/DataModel/vtkPyramid.h | 2 + Common/DataModel/vtkQuad.cxx | 2 + Common/DataModel/vtkQuad.h | 2 + Common/DataModel/vtkQuadraticEdge.cxx | 2 + Common/DataModel/vtkQuadraticEdge.h | 2 + Common/DataModel/vtkQuadraticHexahedron.cxx | 2 + Common/DataModel/vtkQuadraticHexahedron.h | 2 + Common/DataModel/vtkQuadraticLinearQuad.cxx | 2 + Common/DataModel/vtkQuadraticLinearQuad.h | 2 + Common/DataModel/vtkQuadraticLinearWedge.cxx | 2 + Common/DataModel/vtkQuadraticLinearWedge.h | 2 + Common/DataModel/vtkQuadraticPolygon.cxx | 2 + Common/DataModel/vtkQuadraticPolygon.h | 2 + Common/DataModel/vtkQuadraticPyramid.cxx | 2 + Common/DataModel/vtkQuadraticPyramid.h | 2 + Common/DataModel/vtkQuadraticQuad.cxx | 2 + Common/DataModel/vtkQuadraticQuad.h | 2 + Common/DataModel/vtkQuadraticTetra.cxx | 2 + Common/DataModel/vtkQuadraticTetra.h | 2 + Common/DataModel/vtkQuadraticTriangle.cxx | 2 + Common/DataModel/vtkQuadraticTriangle.h | 2 + Common/DataModel/vtkQuadraticWedge.cxx | 2 + Common/DataModel/vtkQuadraticWedge.h | 2 + .../vtkQuadratureSchemeDefinition.cxx | 2 + .../DataModel/vtkQuadratureSchemeDefinition.h | 2 + Common/DataModel/vtkQuadric.cxx | 2 + Common/DataModel/vtkQuadric.h | 2 + Common/DataModel/vtkRect.h | 2 + Common/DataModel/vtkRectilinearGrid.cxx | 2 + Common/DataModel/vtkRectilinearGrid.h | 2 + Common/DataModel/vtkReebGraph.cxx | 2 + Common/DataModel/vtkReebGraph.h | 2 + .../vtkReebGraphSimplificationMetric.cxx | 2 + .../vtkReebGraphSimplificationMetric.h | 2 + Common/DataModel/vtkSelection.cxx | 4 + Common/DataModel/vtkSelection.h | 2 + Common/DataModel/vtkSelectionNode.cxx | 2 + Common/DataModel/vtkSelectionNode.h | 2 + Common/DataModel/vtkSimpleCellTessellator.cxx | 2 + Common/DataModel/vtkSimpleCellTessellator.h | 2 + Common/DataModel/vtkSmoothErrorMetric.cxx | 2 + Common/DataModel/vtkSmoothErrorMetric.h | 2 + Common/DataModel/vtkSortFieldData.cxx | 2 + Common/DataModel/vtkSortFieldData.h | 2 + Common/DataModel/vtkSphere.cxx | 2 + Common/DataModel/vtkSphere.h | 2 + Common/DataModel/vtkSpheres.cxx | 2 + Common/DataModel/vtkSpheres.h | 2 + .../DataModel/vtkSphericalPointIterator.cxx | 2 + Common/DataModel/vtkSphericalPointIterator.h | 2 + Common/DataModel/vtkSpline.cxx | 2 + Common/DataModel/vtkSpline.h | 2 + Common/DataModel/vtkStaticCellLinks.cxx | 2 + Common/DataModel/vtkStaticCellLinks.h | 2 + Common/DataModel/vtkStaticCellLinksTemplate.h | 6 + .../DataModel/vtkStaticCellLinksTemplate.txx | 8 + Common/DataModel/vtkStaticCellLocator.cxx | 2 + Common/DataModel/vtkStaticCellLocator.h | 2 + .../DataModel/vtkStaticEdgeLocatorTemplate.h | 4 + .../vtkStaticEdgeLocatorTemplate.txx | 2 + Common/DataModel/vtkStaticPointLocator.cxx | 2 + Common/DataModel/vtkStaticPointLocator.h | 2 + Common/DataModel/vtkStaticPointLocator2D.cxx | 2 + Common/DataModel/vtkStaticPointLocator2D.h | 2 + Common/DataModel/vtkStructuredData.cxx | 2 + Common/DataModel/vtkStructuredData.h | 2 + Common/DataModel/vtkStructuredExtent.cxx | 2 + Common/DataModel/vtkStructuredExtent.h | 2 + Common/DataModel/vtkStructuredGrid.cxx | 2 + Common/DataModel/vtkStructuredGrid.h | 2 + Common/DataModel/vtkStructuredPoints.cxx | 2 + Common/DataModel/vtkStructuredPoints.h | 2 + .../vtkStructuredPointsCollection.cxx | 2 + .../DataModel/vtkStructuredPointsCollection.h | 2 + Common/DataModel/vtkSuperquadric.cxx | 2 + Common/DataModel/vtkSuperquadric.h | 2 + Common/DataModel/vtkTable.cxx | 2 + Common/DataModel/vtkTable.h | 2 + Common/DataModel/vtkTetra.cxx | 2 + Common/DataModel/vtkTetra.h | 2 + Common/DataModel/vtkTree.cxx | 2 + Common/DataModel/vtkTree.h | 2 + Common/DataModel/vtkTreeBFSIterator.cxx | 2 + Common/DataModel/vtkTreeBFSIterator.h | 2 + Common/DataModel/vtkTreeDFSIterator.cxx | 2 + Common/DataModel/vtkTreeDFSIterator.h | 2 + Common/DataModel/vtkTreeIterator.cxx | 2 + Common/DataModel/vtkTreeIterator.h | 2 + .../DataModel/vtkTriQuadraticHexahedron.cxx | 2 + Common/DataModel/vtkTriQuadraticHexahedron.h | 2 + Common/DataModel/vtkTriQuadraticPyramid.cxx | 2 + Common/DataModel/vtkTriQuadraticPyramid.h | 2 + Common/DataModel/vtkTriangle.cxx | 2 + Common/DataModel/vtkTriangle.h | 2 + Common/DataModel/vtkTriangleStrip.cxx | 2 + Common/DataModel/vtkTriangleStrip.h | 2 + Common/DataModel/vtkUndirectedGraph.cxx | 2 + Common/DataModel/vtkUndirectedGraph.h | 2 + Common/DataModel/vtkUniformGrid.cxx | 2 + Common/DataModel/vtkUniformGrid.h | 2 + Common/DataModel/vtkUniformGridAMR.cxx | 2 + Common/DataModel/vtkUniformGridAMR.h | 2 + .../vtkUniformGridAMRDataIterator.cxx | 2 + .../DataModel/vtkUniformGridAMRDataIterator.h | 2 + Common/DataModel/vtkUniformHyperTreeGrid.cxx | 2 + Common/DataModel/vtkUniformHyperTreeGrid.h | 2 + Common/DataModel/vtkUnstructuredGrid.cxx | 2 + Common/DataModel/vtkUnstructuredGrid.h | 2 + Common/DataModel/vtkUnstructuredGridBase.cxx | 2 + Common/DataModel/vtkUnstructuredGridBase.h | 2 + .../vtkUnstructuredGridCellIterator.cxx | 2 + .../vtkUnstructuredGridCellIterator.h | 2 + Common/DataModel/vtkVector.h | 2 + Common/DataModel/vtkVectorOperators.h | 2 + Common/DataModel/vtkVertex.cxx | 2 + Common/DataModel/vtkVertex.h | 2 + Common/DataModel/vtkVertexListIterator.cxx | 2 + Common/DataModel/vtkVertexListIterator.h | 2 + Common/DataModel/vtkVoxel.cxx | 4 + Common/DataModel/vtkVoxel.h | 2 + Common/DataModel/vtkWedge.cxx | 2 + Common/DataModel/vtkWedge.h | 2 + Common/DataModel/vtkXMLDataElement.cxx | 2 + Common/DataModel/vtkXMLDataElement.h | 2 + Common/ExecutionModel/vtkAlgorithm.cxx | 2 + Common/ExecutionModel/vtkAlgorithm.h | 2 + Common/ExecutionModel/vtkAlgorithmOutput.cxx | 2 + Common/ExecutionModel/vtkAlgorithmOutput.h | 2 + .../vtkAnnotationLayersAlgorithm.cxx | 2 + .../vtkAnnotationLayersAlgorithm.h | 2 + .../ExecutionModel/vtkArrayDataAlgorithm.cxx | 2 + Common/ExecutionModel/vtkArrayDataAlgorithm.h | 2 + ...vtkCachedStreamingDemandDrivenPipeline.cxx | 2 + .../vtkCachedStreamingDemandDrivenPipeline.h | 2 + Common/ExecutionModel/vtkCastToConcrete.cxx | 2 + Common/ExecutionModel/vtkCastToConcrete.h | 2 + .../vtkCompositeDataPipeline.cxx | 2 + .../ExecutionModel/vtkCompositeDataPipeline.h | 2 + .../vtkCompositeDataSetAlgorithm.cxx | 2 + .../vtkCompositeDataSetAlgorithm.h | 2 + .../ExecutionModel/vtkDataObjectAlgorithm.cxx | 2 + .../ExecutionModel/vtkDataObjectAlgorithm.h | 2 + Common/ExecutionModel/vtkDataSetAlgorithm.cxx | 2 + Common/ExecutionModel/vtkDataSetAlgorithm.h | 2 + .../vtkDemandDrivenPipeline.cxx | 2 + .../ExecutionModel/vtkDemandDrivenPipeline.h | 2 + .../vtkDirectedGraphAlgorithm.cxx | 2 + .../vtkDirectedGraphAlgorithm.h | 2 + Common/ExecutionModel/vtkEnsembleSource.cxx | 2 + Common/ExecutionModel/vtkEnsembleSource.h | 2 + Common/ExecutionModel/vtkExecutive.cxx | 2 + Common/ExecutionModel/vtkExecutive.h | 2 + .../vtkExplicitStructuredGridAlgorithm.cxx | 2 + .../vtkExplicitStructuredGridAlgorithm.h | 2 + .../vtkExtentRCBPartitioner.cxx | 2 + .../ExecutionModel/vtkExtentRCBPartitioner.h | 2 + Common/ExecutionModel/vtkExtentSplitter.cxx | 2 + Common/ExecutionModel/vtkExtentSplitter.h | 2 + Common/ExecutionModel/vtkExtentTranslator.cxx | 2 + Common/ExecutionModel/vtkExtentTranslator.h | 2 + .../vtkFilteringInformationKeyManager.cxx | 2 + .../vtkFilteringInformationKeyManager.h | 2 + Common/ExecutionModel/vtkGraphAlgorithm.cxx | 2 + Common/ExecutionModel/vtkGraphAlgorithm.h | 2 + .../vtkHierarchicalBoxDataSetAlgorithm.cxx | 2 + .../vtkHierarchicalBoxDataSetAlgorithm.h | 2 + .../vtkHyperTreeGridAlgorithm.cxx | 2 + .../vtkHyperTreeGridAlgorithm.h | 2 + Common/ExecutionModel/vtkImageAlgorithm.cxx | 2 + Common/ExecutionModel/vtkImageAlgorithm.h | 2 + .../ExecutionModel/vtkImageInPlaceFilter.cxx | 2 + Common/ExecutionModel/vtkImageInPlaceFilter.h | 2 + .../vtkImageProgressIterator.cxx | 2 + .../ExecutionModel/vtkImageProgressIterator.h | 2 + .../vtkImageProgressIterator.txx | 2 + .../vtkImageToStructuredGrid.cxx | 2 + .../ExecutionModel/vtkImageToStructuredGrid.h | 2 + .../vtkImageToStructuredPoints.cxx | 2 + .../vtkImageToStructuredPoints.h | 2 + .../vtkInformationDataObjectMetaDataKey.cxx | 2 + .../vtkInformationDataObjectMetaDataKey.h | 2 + .../vtkInformationExecutivePortKey.cxx | 2 + .../vtkInformationExecutivePortKey.h | 2 + .../vtkInformationExecutivePortVectorKey.cxx | 2 + .../vtkInformationExecutivePortVectorKey.h | 2 + .../vtkInformationIntegerRequestKey.cxx | 2 + .../vtkInformationIntegerRequestKey.h | 2 + .../ExecutionModel/vtkMoleculeAlgorithm.cxx | 2 + Common/ExecutionModel/vtkMoleculeAlgorithm.h | 2 + .../vtkMultiBlockDataSetAlgorithm.cxx | 2 + .../vtkMultiBlockDataSetAlgorithm.h | 2 + .../vtkMultiTimeStepAlgorithm.cxx | 2 + .../vtkMultiTimeStepAlgorithm.h | 2 + .../vtkNonOverlappingAMRAlgorithm.cxx | 2 + .../vtkNonOverlappingAMRAlgorithm.h | 2 + .../vtkOverlappingAMRAlgorithm.cxx | 2 + .../vtkOverlappingAMRAlgorithm.h | 2 + Common/ExecutionModel/vtkParallelReader.cxx | 2 + Common/ExecutionModel/vtkParallelReader.h | 2 + .../vtkPartitionedDataSetAlgorithm.cxx | 2 + .../vtkPartitionedDataSetAlgorithm.h | 2 + ...kPartitionedDataSetCollectionAlgorithm.cxx | 2 + ...vtkPartitionedDataSetCollectionAlgorithm.h | 2 + .../vtkPassInputTypeAlgorithm.cxx | 2 + .../vtkPassInputTypeAlgorithm.h | 2 + .../vtkPiecewiseFunctionAlgorithm.cxx | 2 + .../vtkPiecewiseFunctionAlgorithm.h | 2 + .../vtkPiecewiseFunctionShiftScale.cxx | 2 + .../vtkPiecewiseFunctionShiftScale.h | 2 + .../ExecutionModel/vtkPointSetAlgorithm.cxx | 2 + Common/ExecutionModel/vtkPointSetAlgorithm.h | 2 + .../ExecutionModel/vtkPolyDataAlgorithm.cxx | 2 + Common/ExecutionModel/vtkPolyDataAlgorithm.h | 2 + Common/ExecutionModel/vtkProgressObserver.cxx | 2 + Common/ExecutionModel/vtkProgressObserver.h | 2 + Common/ExecutionModel/vtkReaderAlgorithm.cxx | 2 + Common/ExecutionModel/vtkReaderAlgorithm.h | 2 + .../vtkRectilinearGridAlgorithm.cxx | 2 + .../vtkRectilinearGridAlgorithm.h | 2 + .../ExecutionModel/vtkSMPProgressObserver.cxx | 2 + .../ExecutionModel/vtkSMPProgressObserver.h | 2 + Common/ExecutionModel/vtkScalarTree.cxx | 2 + Common/ExecutionModel/vtkScalarTree.h | 2 + .../ExecutionModel/vtkSelectionAlgorithm.cxx | 2 + Common/ExecutionModel/vtkSelectionAlgorithm.h | 2 + .../vtkSimpleImageToImageFilter.cxx | 2 + .../vtkSimpleImageToImageFilter.h | 2 + Common/ExecutionModel/vtkSimpleReader.cxx | 2 + Common/ExecutionModel/vtkSimpleReader.h | 2 + Common/ExecutionModel/vtkSimpleScalarTree.cxx | 2 + Common/ExecutionModel/vtkSimpleScalarTree.h | 2 + Common/ExecutionModel/vtkSpanSpace.cxx | 2 + Common/ExecutionModel/vtkSpanSpace.h | 2 + Common/ExecutionModel/vtkSphereTree.cxx | 2 + Common/ExecutionModel/vtkSphereTree.h | 2 + .../vtkStreamingDemandDrivenPipeline.cxx | 2 + .../vtkStreamingDemandDrivenPipeline.h | 2 + .../vtkStructuredGridAlgorithm.cxx | 2 + .../vtkStructuredGridAlgorithm.h | 2 + Common/ExecutionModel/vtkTableAlgorithm.cxx | 2 + Common/ExecutionModel/vtkTableAlgorithm.h | 2 + .../vtkThreadedCompositeDataPipeline.cxx | 2 + .../vtkThreadedCompositeDataPipeline.h | 2 + .../vtkThreadedImageAlgorithm.cxx | 6 + .../vtkThreadedImageAlgorithm.h | 2 + Common/ExecutionModel/vtkTreeAlgorithm.cxx | 2 + Common/ExecutionModel/vtkTreeAlgorithm.h | 2 + Common/ExecutionModel/vtkTrivialConsumer.cxx | 2 + Common/ExecutionModel/vtkTrivialConsumer.h | 2 + Common/ExecutionModel/vtkTrivialProducer.cxx | 2 + Common/ExecutionModel/vtkTrivialProducer.h | 2 + .../vtkUndirectedGraphAlgorithm.cxx | 2 + .../vtkUndirectedGraphAlgorithm.h | 2 + .../vtkUniformGridAMRAlgorithm.cxx | 2 + .../vtkUniformGridAMRAlgorithm.h | 2 + .../vtkUniformGridPartitioner.cxx | 2 + .../vtkUniformGridPartitioner.h | 2 + .../vtkUnstructuredGridAlgorithm.cxx | 2 + .../vtkUnstructuredGridAlgorithm.h | 2 + .../vtkUnstructuredGridBaseAlgorithm.cxx | 2 + .../vtkUnstructuredGridBaseAlgorithm.h | 2 + Common/Math/vtkAmoebaMinimizer.cxx | 2 + Common/Math/vtkAmoebaMinimizer.h | 2 + Common/Math/vtkFFT.cxx | 2 + Common/Math/vtkFFT.h | 3 + Common/Math/vtkFFT.txx | 2 + Common/Math/vtkFunctionSet.cxx | 2 + Common/Math/vtkFunctionSet.h | 2 + Common/Math/vtkInitialValueProblemSolver.cxx | 2 + Common/Math/vtkInitialValueProblemSolver.h | 2 + Common/Math/vtkMatrix3x3.cxx | 2 + Common/Math/vtkMatrix3x3.h | 2 + Common/Math/vtkMatrix4x4.cxx | 2 + Common/Math/vtkMatrix4x4.h | 2 + .../Math/vtkPolynomialSolversUnivariate.cxx | 2 + Common/Math/vtkPolynomialSolversUnivariate.h | 2 + Common/Math/vtkQuaternion.h | 2 + Common/Math/vtkQuaternion.txx | 2 + Common/Math/vtkQuaternionInterpolator.cxx | 2 + Common/Math/vtkQuaternionInterpolator.h | 2 + Common/Math/vtkReservoirSampler.cxx | 2 + Common/Math/vtkReservoirSampler.h | 3 + Common/Math/vtkRungeKutta2.cxx | 2 + Common/Math/vtkRungeKutta2.h | 2 + Common/Math/vtkRungeKutta4.cxx | 2 + Common/Math/vtkRungeKutta4.h | 2 + Common/Math/vtkRungeKutta45.cxx | 2 + Common/Math/vtkRungeKutta45.h | 2 + Common/Math/vtkTuple.h | 2 + Common/Misc/vtkContourValues.cxx | 2 + Common/Misc/vtkContourValues.h | 2 + Common/Misc/vtkErrorCode.cxx | 2 + Common/Misc/vtkErrorCode.h | 2 + Common/Misc/vtkExprTkFunctionParser.cxx | 2 + Common/Misc/vtkExprTkFunctionParser.h | 2 + Common/Misc/vtkFunctionParser.cxx | 2 + Common/Misc/vtkFunctionParser.h | 2 + Common/Misc/vtkHeap.cxx | 2 + Common/Misc/vtkHeap.h | 2 + Common/Misc/vtkPolygonBuilder.cxx | 2 + Common/Misc/vtkPolygonBuilder.h | 2 + Common/Misc/vtkResourceFileLocator.cxx | 2 + Common/Misc/vtkResourceFileLocator.h | 2 + Common/Python/vtkPythonArchiver.cxx | 2 + Common/Python/vtkPythonArchiver.h | 2 + Common/System/vtkClientSocket.cxx | 2 + Common/System/vtkClientSocket.h | 2 + Common/System/vtkDirectory.cxx | 6 + Common/System/vtkDirectory.h | 2 + Common/System/vtkExecutableRunner.cxx | 4 + Common/System/vtkExecutableRunner.h | 2 + Common/System/vtkServerSocket.cxx | 2 + Common/System/vtkServerSocket.h | 2 + Common/System/vtkSocket.cxx | 4 + Common/System/vtkSocket.h | 2 + Common/System/vtkSocketCollection.cxx | 2 + Common/System/vtkSocketCollection.h | 2 + Common/System/vtkTimerLog.cxx | 2 + Common/System/vtkTimerLog.h | 2 + Common/Transforms/vtkAbstractTransform.cxx | 2 + Common/Transforms/vtkAbstractTransform.h | 2 + Common/Transforms/vtkCylindricalTransform.cxx | 2 + Common/Transforms/vtkCylindricalTransform.h | 2 + Common/Transforms/vtkGeneralTransform.cxx | 2 + Common/Transforms/vtkGeneralTransform.h | 2 + Common/Transforms/vtkHomogeneousTransform.cxx | 2 + Common/Transforms/vtkHomogeneousTransform.h | 2 + Common/Transforms/vtkIdentityTransform.cxx | 2 + Common/Transforms/vtkIdentityTransform.h | 2 + Common/Transforms/vtkLandmarkTransform.cxx | 2 + Common/Transforms/vtkLandmarkTransform.h | 2 + Common/Transforms/vtkLinearTransform.cxx | 2 + Common/Transforms/vtkLinearTransform.h | 2 + .../vtkMatrixToHomogeneousTransform.cxx | 2 + .../vtkMatrixToHomogeneousTransform.h | 2 + .../Transforms/vtkMatrixToLinearTransform.cxx | 2 + .../Transforms/vtkMatrixToLinearTransform.h | 2 + Common/Transforms/vtkPerspectiveTransform.cxx | 2 + Common/Transforms/vtkPerspectiveTransform.h | 2 + Common/Transforms/vtkSphericalTransform.cxx | 2 + Common/Transforms/vtkSphericalTransform.h | 2 + .../vtkThinPlateSplineTransform.cxx | 2 + .../Transforms/vtkThinPlateSplineTransform.h | 2 + Common/Transforms/vtkTransform.cxx | 2 + Common/Transforms/vtkTransform.h | 2 + Common/Transforms/vtkTransform2D.cxx | 2 + Common/Transforms/vtkTransform2D.h | 2 + Common/Transforms/vtkTransformCollection.cxx | 2 + Common/Transforms/vtkTransformCollection.h | 2 + Common/Transforms/vtkWarpTransform.cxx | 2 + Common/Transforms/vtkWarpTransform.h | 2 + Domains/Chemistry/vtkBlueObeliskData.cxx | 6 + Domains/Chemistry/vtkBlueObeliskData.h | 2 + .../Chemistry/vtkBlueObeliskDataInternal.h | 2 + .../Chemistry/vtkBlueObeliskDataParser.cxx | 2 + Domains/Chemistry/vtkBlueObeliskDataParser.h | 2 + Domains/Chemistry/vtkMoleculeMapper.cxx | 2 + Domains/Chemistry/vtkMoleculeMapper.h | 2 + .../Chemistry/vtkMoleculeToAtomBallFilter.cxx | 2 + .../Chemistry/vtkMoleculeToAtomBallFilter.h | 2 + .../vtkMoleculeToBondStickFilter.cxx | 2 + .../Chemistry/vtkMoleculeToBondStickFilter.h | 2 + .../Chemistry/vtkMoleculeToLinesFilter.cxx | 2 + Domains/Chemistry/vtkMoleculeToLinesFilter.h | 2 + .../Chemistry/vtkMoleculeToPolyDataFilter.cxx | 2 + .../Chemistry/vtkMoleculeToPolyDataFilter.h | 2 + .../Chemistry/vtkOpenQubeElectronicData.cxx | 2 + Domains/Chemistry/vtkOpenQubeElectronicData.h | 3 + .../Chemistry/vtkOpenQubeMoleculeSource.cxx | 2 + Domains/Chemistry/vtkOpenQubeMoleculeSource.h | 6 +- Domains/Chemistry/vtkPeriodicTable.cxx | 2 + Domains/Chemistry/vtkPeriodicTable.h | 2 + .../Chemistry/vtkPointSetToMoleculeFilter.cxx | 2 + .../Chemistry/vtkPointSetToMoleculeFilter.h | 2 + .../vtkProgrammableElectronicData.cxx | 2 + .../Chemistry/vtkProgrammableElectronicData.h | 2 + Domains/Chemistry/vtkProteinRibbonFilter.cxx | 2 + Domains/Chemistry/vtkProteinRibbonFilter.h | 2 + Domains/Chemistry/vtkSimpleBondPerceiver.cxx | 2 + Domains/Chemistry/vtkSimpleBondPerceiver.h | 2 + .../vtkOpenGLMoleculeMapper.cxx | 2 + .../vtkOpenGLMoleculeMapper.h | 2 + Domains/Microscopy/vtkOpenSlideReader.cxx | 2 + Domains/Microscopy/vtkOpenSlideReader.h | 2 + .../vtkPSimpleBondPerceiver.cxx | 2 + .../vtkPSimpleBondPerceiver.h | 2 + Examples/AMR/Cxx/AMRCommon.h | 2 + Examples/Build/vtkMy/Common/vtkBar.cxx | 2 + Examples/Build/vtkMy/Common/vtkBar.h | 2 + Examples/Build/vtkMy/Imaging/vtkImageFoo.cxx | 2 + Examples/Build/vtkMy/Imaging/vtkImageFoo.h | 2 + Examples/Build/vtkMy/Unsorted/vtkBar2.cxx | 2 + Examples/Build/vtkMy/Unsorted/vtkBar2.h | 2 + Examples/Charts/Cxx/vtkGraphItem.h | 2 + Examples/GUI/Qt/SimpleView/SimpleView.h | 2 + .../Cxx/CustomLinkView/CustomLinkView.h | 2 + Examples/Infovis/Cxx/EasyView/EasyView.h | 2 + Examples/Infovis/Cxx/StatsView/StatsView.h | 2 + Filters/AMR/vtkAMRCutPlane.cxx | 2 + Filters/AMR/vtkAMRCutPlane.h | 2 + Filters/AMR/vtkAMRGaussianPulseSource.cxx | 2 + Filters/AMR/vtkAMRGaussianPulseSource.h | 2 + Filters/AMR/vtkAMRResampleFilter.cxx | 2 + Filters/AMR/vtkAMRResampleFilter.h | 2 + Filters/AMR/vtkAMRSliceFilter.cxx | 2 + Filters/AMR/vtkAMRSliceFilter.h | 2 + Filters/AMR/vtkAMRToMultiBlockFilter.cxx | 2 + Filters/AMR/vtkAMRToMultiBlockFilter.h | 2 + Filters/AMR/vtkImageToAMR.cxx | 2 + Filters/AMR/vtkImageToAMR.h | 2 + Filters/AMR/vtkParallelAMRUtilities.cxx | 2 + Filters/AMR/vtkParallelAMRUtilities.h | 2 + Filters/Core/VoronoiKernel.cxx | 2 + .../Core/vtk3DLinearGridCrinkleExtractor.cxx | 2 + .../Core/vtk3DLinearGridCrinkleExtractor.h | 2 + Filters/Core/vtk3DLinearGridPlaneCutter.cxx | 2 + Filters/Core/vtk3DLinearGridPlaneCutter.h | 2 + Filters/Core/vtkAppendArcLength.cxx | 2 + Filters/Core/vtkAppendArcLength.h | 2 + Filters/Core/vtkAppendCompositeDataLeaves.cxx | 2 + Filters/Core/vtkAppendCompositeDataLeaves.h | 2 + Filters/Core/vtkAppendDataSets.cxx | 2 + Filters/Core/vtkAppendDataSets.h | 2 + Filters/Core/vtkAppendFilter.cxx | 2 + Filters/Core/vtkAppendFilter.h | 2 + Filters/Core/vtkAppendPolyData.cxx | 2 + Filters/Core/vtkAppendPolyData.h | 2 + Filters/Core/vtkAppendSelection.cxx | 2 + Filters/Core/vtkAppendSelection.h | 2 + Filters/Core/vtkArrayCalculator.cxx | 2 + Filters/Core/vtkArrayCalculator.h | 2 + Filters/Core/vtkArrayRename.cxx | 2 + Filters/Core/vtkArrayRename.h | 2 + Filters/Core/vtkAssignAttribute.cxx | 2 + Filters/Core/vtkAssignAttribute.h | 2 + .../vtkAttributeDataToFieldDataFilter.cxx | 2 + .../Core/vtkAttributeDataToFieldDataFilter.h | 2 + Filters/Core/vtkBinCellDataFilter.cxx | 2 + Filters/Core/vtkBinCellDataFilter.h | 2 + Filters/Core/vtkBinnedDecimation.cxx | 2 + Filters/Core/vtkBinnedDecimation.h | 2 + Filters/Core/vtkCellCenters.cxx | 2 + Filters/Core/vtkCellCenters.h | 2 + Filters/Core/vtkCellDataToPointData.cxx | 2 + Filters/Core/vtkCellDataToPointData.h | 2 + Filters/Core/vtkCenterOfMass.cxx | 2 + Filters/Core/vtkCenterOfMass.h | 2 + Filters/Core/vtkCleanPolyData.cxx | 2 + Filters/Core/vtkCleanPolyData.h | 2 + Filters/Core/vtkClipPolyData.cxx | 2 + Filters/Core/vtkClipPolyData.h | 2 + Filters/Core/vtkCompositeCutter.cxx | 2 + Filters/Core/vtkCompositeCutter.h | 2 + Filters/Core/vtkCompositeDataProbeFilter.cxx | 2 + Filters/Core/vtkCompositeDataProbeFilter.h | 2 + Filters/Core/vtkConnectivityFilter.cxx | 2 + Filters/Core/vtkConnectivityFilter.h | 2 + .../Core/vtkConstrainedSmoothingFilter.cxx | 4 + Filters/Core/vtkConstrainedSmoothingFilter.h | 2 + Filters/Core/vtkContour3DLinearGrid.cxx | 2 + Filters/Core/vtkContour3DLinearGrid.h | 2 + Filters/Core/vtkContourFilter.cxx | 2 + Filters/Core/vtkContourFilter.h | 2 + Filters/Core/vtkContourGrid.cxx | 2 + Filters/Core/vtkContourGrid.h | 2 + Filters/Core/vtkContourHelper.cxx | 2 + Filters/Core/vtkContourHelper.h | 2 + .../Core/vtkConvertToMultiBlockDataSet.cxx | 2 + Filters/Core/vtkConvertToMultiBlockDataSet.h | 2 + ...kConvertToPartitionedDataSetCollection.cxx | 2 + ...vtkConvertToPartitionedDataSetCollection.h | 2 + Filters/Core/vtkConvertToPolyhedra.cxx | 2 + Filters/Core/vtkConvertToPolyhedra.h | 2 + Filters/Core/vtkCutter.cxx | 2 + Filters/Core/vtkCutter.h | 2 + Filters/Core/vtkDataObjectGenerator.cxx | 2 + Filters/Core/vtkDataObjectGenerator.h | 2 + Filters/Core/vtkDataObjectToDataSetFilter.cxx | 2 + Filters/Core/vtkDataObjectToDataSetFilter.h | 2 + .../vtkDataSetEdgeSubdivisionCriterion.cxx | 2 + .../Core/vtkDataSetEdgeSubdivisionCriterion.h | 2 + Filters/Core/vtkDataSetToDataObjectFilter.cxx | 2 + Filters/Core/vtkDataSetToDataObjectFilter.h | 2 + Filters/Core/vtkDecimatePolylineFilter.cxx | 2 + Filters/Core/vtkDecimatePolylineFilter.h | 2 + Filters/Core/vtkDecimatePro.cxx | 2 + Filters/Core/vtkDecimatePro.h | 2 + Filters/Core/vtkDelaunay2D.cxx | 2 + Filters/Core/vtkDelaunay2D.h | 2 + Filters/Core/vtkDelaunay3D.cxx | 2 + Filters/Core/vtkDelaunay3D.h | 2 + Filters/Core/vtkEdgeSubdivisionCriterion.cxx | 2 + Filters/Core/vtkEdgeSubdivisionCriterion.h | 2 + Filters/Core/vtkElevationFilter.cxx | 2 + Filters/Core/vtkElevationFilter.h | 2 + Filters/Core/vtkExecutionTimer.cxx | 2 + Filters/Core/vtkExecutionTimer.h | 2 + .../Core/vtkExplicitStructuredGridCrop.cxx | 2 + Filters/Core/vtkExplicitStructuredGridCrop.h | 2 + ...plicitStructuredGridToUnstructuredGrid.cxx | 2 + ...ExplicitStructuredGridToUnstructuredGrid.h | 2 + Filters/Core/vtkExtractCellsAlongPolyLine.cxx | 2 + Filters/Core/vtkExtractCellsAlongPolyLine.h | 2 + Filters/Core/vtkExtractEdges.cxx | 4 + Filters/Core/vtkExtractEdges.h | 2 + Filters/Core/vtkFeatureEdges.cxx | 5 + Filters/Core/vtkFeatureEdges.h | 2 + .../vtkFieldDataToAttributeDataFilter.cxx | 2 + .../Core/vtkFieldDataToAttributeDataFilter.h | 2 + Filters/Core/vtkFlyingEdges2D.cxx | 2 + Filters/Core/vtkFlyingEdges2D.h | 2 + Filters/Core/vtkFlyingEdges3D.cxx | 2 + Filters/Core/vtkFlyingEdges3D.h | 2 + Filters/Core/vtkFlyingEdgesPlaneCutter.cxx | 2 + Filters/Core/vtkFlyingEdgesPlaneCutter.h | 2 + Filters/Core/vtkGlyph2D.cxx | 2 + Filters/Core/vtkGlyph2D.h | 2 + Filters/Core/vtkGlyph3D.cxx | 2 + Filters/Core/vtkGlyph3D.h | 2 + .../Core/vtkGridSynchronizedTemplates3D.cxx | 2 + Filters/Core/vtkGridSynchronizedTemplates3D.h | 2 + Filters/Core/vtkHedgeHog.cxx | 2 + Filters/Core/vtkHedgeHog.h | 2 + Filters/Core/vtkHull.cxx | 2 + Filters/Core/vtkHull.h | 2 + Filters/Core/vtkHyperTreeGridProbeFilter.cxx | 2 + Filters/Core/vtkHyperTreeGridProbeFilter.h | 2 + Filters/Core/vtkIdFilter.cxx | 2 + Filters/Core/vtkIdFilter.h | 2 + Filters/Core/vtkImageAppend.cxx | 2 + Filters/Core/vtkImageAppend.h | 2 + .../vtkImageDataToExplicitStructuredGrid.cxx | 2 + .../vtkImageDataToExplicitStructuredGrid.h | 2 + Filters/Core/vtkImplicitPolyDataDistance.cxx | 2 + Filters/Core/vtkImplicitPolyDataDistance.h | 2 + .../vtkImplicitProjectOnPlaneDistance.cxx | 2 + .../Core/vtkImplicitProjectOnPlaneDistance.h | 2 + Filters/Core/vtkMarchingCubes.cxx | 2 + Filters/Core/vtkMarchingCubes.h | 2 + Filters/Core/vtkMarchingSquares.cxx | 2 + Filters/Core/vtkMarchingSquares.h | 2 + Filters/Core/vtkMaskFields.cxx | 2 + Filters/Core/vtkMaskFields.h | 2 + Filters/Core/vtkMaskPoints.cxx | 2 + Filters/Core/vtkMaskPoints.h | 2 + Filters/Core/vtkMaskPolyData.cxx | 2 + Filters/Core/vtkMaskPolyData.h | 2 + Filters/Core/vtkMassProperties.cxx | 2 + Filters/Core/vtkMassProperties.h | 2 + Filters/Core/vtkMergeDataObjectFilter.cxx | 2 + Filters/Core/vtkMergeDataObjectFilter.h | 2 + Filters/Core/vtkMergeFields.cxx | 2 + Filters/Core/vtkMergeFields.h | 2 + Filters/Core/vtkMergeFilter.cxx | 2 + Filters/Core/vtkMergeFilter.h | 2 + Filters/Core/vtkMoleculeAppend.cxx | 2 + Filters/Core/vtkMoleculeAppend.h | 2 + Filters/Core/vtkMultiObjectMassProperties.cxx | 2 + Filters/Core/vtkMultiObjectMassProperties.h | 2 + Filters/Core/vtkPassThrough.cxx | 2 + Filters/Core/vtkPassThrough.h | 2 + Filters/Core/vtkPlaneCutter.cxx | 2 + Filters/Core/vtkPlaneCutter.h | 2 + Filters/Core/vtkPointDataToCellData.cxx | 2 + Filters/Core/vtkPointDataToCellData.h | 2 + .../Core/vtkPolyDataConnectivityFilter.cxx | 2 + Filters/Core/vtkPolyDataConnectivityFilter.h | 2 + .../vtkPolyDataEdgeConnectivityFilter.cxx | 2 + .../Core/vtkPolyDataEdgeConnectivityFilter.h | 2 + Filters/Core/vtkPolyDataNormals.cxx | 2 + Filters/Core/vtkPolyDataNormals.h | 2 + Filters/Core/vtkPolyDataPlaneClipper.cxx | 2 + Filters/Core/vtkPolyDataPlaneClipper.h | 2 + Filters/Core/vtkPolyDataPlaneCutter.cxx | 6 + Filters/Core/vtkPolyDataPlaneCutter.h | 2 + Filters/Core/vtkPolyDataTangents.cxx | 2 + Filters/Core/vtkPolyDataTangents.h | 2 + Filters/Core/vtkProbeFilter.cxx | 2 + Filters/Core/vtkProbeFilter.h | 2 + Filters/Core/vtkQuadricClustering.cxx | 2 + Filters/Core/vtkQuadricClustering.h | 2 + Filters/Core/vtkQuadricDecimation.cxx | 2 + Filters/Core/vtkQuadricDecimation.h | 2 + Filters/Core/vtkRearrangeFields.cxx | 2 + Filters/Core/vtkRearrangeFields.h | 2 + .../vtkRectilinearSynchronizedTemplates.cxx | 2 + .../vtkRectilinearSynchronizedTemplates.h | 2 + Filters/Core/vtkRemoveDuplicatePolys.cxx | 2 + Filters/Core/vtkRemoveDuplicatePolys.h | 2 + Filters/Core/vtkRemoveUnusedPoints.cxx | 2 + Filters/Core/vtkRemoveUnusedPoints.h | 2 + Filters/Core/vtkResampleToImage.cxx | 2 + Filters/Core/vtkResampleToImage.h | 2 + Filters/Core/vtkResampleWithDataSet.cxx | 2 + Filters/Core/vtkResampleWithDataSet.h | 2 + Filters/Core/vtkReverseSense.cxx | 2 + Filters/Core/vtkReverseSense.h | 2 + Filters/Core/vtkSimpleElevationFilter.cxx | 2 + Filters/Core/vtkSimpleElevationFilter.h | 2 + Filters/Core/vtkSmoothPolyDataFilter.cxx | 2 + Filters/Core/vtkSmoothPolyDataFilter.h | 2 + Filters/Core/vtkSphereTreeFilter.cxx | 2 + Filters/Core/vtkSphereTreeFilter.h | 2 + Filters/Core/vtkStaticCleanPolyData.cxx | 2 + Filters/Core/vtkStaticCleanPolyData.h | 2 + .../Core/vtkStaticCleanUnstructuredGrid.cxx | 2 + Filters/Core/vtkStaticCleanUnstructuredGrid.h | 2 + Filters/Core/vtkStreamerBase.cxx | 2 + Filters/Core/vtkStreamerBase.h | 2 + Filters/Core/vtkStreamingTessellator.cxx | 2 + Filters/Core/vtkStreamingTessellator.h | 2 + Filters/Core/vtkStripper.cxx | 2 + Filters/Core/vtkStripper.h | 2 + Filters/Core/vtkStructuredDataPlaneCutter.cxx | 2 + Filters/Core/vtkStructuredDataPlaneCutter.h | 2 + Filters/Core/vtkStructuredGridAppend.cxx | 2 + Filters/Core/vtkStructuredGridAppend.h | 2 + .../Core/vtkStructuredGridOutlineFilter.cxx | 2 + Filters/Core/vtkStructuredGridOutlineFilter.h | 2 + Filters/Core/vtkSurfaceNets2D.cxx | 2 + Filters/Core/vtkSurfaceNets2D.h | 3 + Filters/Core/vtkSynchronizedTemplates2D.cxx | 2 + Filters/Core/vtkSynchronizedTemplates2D.h | 2 + Filters/Core/vtkSynchronizedTemplates3D.cxx | 2 + Filters/Core/vtkSynchronizedTemplates3D.h | 2 + .../Core/vtkSynchronizedTemplatesCutter3D.cxx | 2 + .../Core/vtkSynchronizedTemplatesCutter3D.h | 2 + Filters/Core/vtkTensorGlyph.cxx | 2 + Filters/Core/vtkTensorGlyph.h | 2 + Filters/Core/vtkThreshold.cxx | 2 + Filters/Core/vtkThreshold.h | 2 + Filters/Core/vtkThresholdPoints.cxx | 2 + Filters/Core/vtkThresholdPoints.h | 2 + Filters/Core/vtkTransposeTable.cxx | 2 + Filters/Core/vtkTransposeTable.h | 2 + Filters/Core/vtkTriangleFilter.cxx | 2 + Filters/Core/vtkTriangleFilter.h | 2 + Filters/Core/vtkTriangleMeshPointNormals.cxx | 2 + Filters/Core/vtkTriangleMeshPointNormals.h | 2 + Filters/Core/vtkTubeBender.cxx | 2 + Filters/Core/vtkTubeBender.h | 2 + Filters/Core/vtkTubeFilter.cxx | 2 + Filters/Core/vtkTubeFilter.h | 2 + .../vtkUnstructuredGridQuadricDecimation.cxx | 2 + .../vtkUnstructuredGridQuadricDecimation.h | 2 + ...structuredGridToExplicitStructuredGrid.cxx | 2 + ...UnstructuredGridToExplicitStructuredGrid.h | 2 + Filters/Core/vtkVectorDot.cxx | 2 + Filters/Core/vtkVectorDot.h | 2 + Filters/Core/vtkVectorNorm.cxx | 2 + Filters/Core/vtkVectorNorm.h | 2 + Filters/Core/vtkVoronoi2D.cxx | 2 + Filters/Core/vtkVoronoi2D.h | 2 + .../Core/vtkWindowedSincPolyDataFilter.cxx | 2 + Filters/Core/vtkWindowedSincPolyDataFilter.h | 2 + Filters/Extraction/vtkBlockSelector.cxx | 2 + Filters/Extraction/vtkBlockSelector.h | 2 + Filters/Extraction/vtkConvertSelection.cxx | 2 + Filters/Extraction/vtkConvertSelection.h | 2 + .../Extraction/vtkExpandMarkedElements.cxx | 2 + Filters/Extraction/vtkExpandMarkedElements.h | 2 + Filters/Extraction/vtkExtractBlock.cxx | 2 + Filters/Extraction/vtkExtractBlock.h | 2 + .../vtkExtractBlockUsingDataAssembly.cxx | 2 + .../vtkExtractBlockUsingDataAssembly.h | 2 + Filters/Extraction/vtkExtractCells.cxx | 2 + Filters/Extraction/vtkExtractCells.h | 2 + Filters/Extraction/vtkExtractCellsByType.cxx | 4 + Filters/Extraction/vtkExtractCellsByType.h | 2 + .../vtkExtractDataArraysOverTime.cxx | 2 + .../Extraction/vtkExtractDataArraysOverTime.h | 2 + Filters/Extraction/vtkExtractDataOverTime.cxx | 2 + Filters/Extraction/vtkExtractDataOverTime.h | 2 + Filters/Extraction/vtkExtractDataSets.cxx | 2 + Filters/Extraction/vtkExtractDataSets.h | 2 + ...tkExtractExodusGlobalTemporalVariables.cxx | 2 + .../vtkExtractExodusGlobalTemporalVariables.h | 2 + Filters/Extraction/vtkExtractGeometry.cxx | 2 + Filters/Extraction/vtkExtractGeometry.h | 2 + Filters/Extraction/vtkExtractGrid.cxx | 2 + Filters/Extraction/vtkExtractGrid.h | 2 + Filters/Extraction/vtkExtractLevel.cxx | 2 + Filters/Extraction/vtkExtractLevel.h | 2 + .../vtkExtractParticlesOverTime.cxx | 2 + .../Extraction/vtkExtractParticlesOverTime.h | 2 + .../Extraction/vtkExtractPolyDataGeometry.cxx | 2 + .../Extraction/vtkExtractPolyDataGeometry.h | 2 + .../Extraction/vtkExtractRectilinearGrid.cxx | 2 + .../Extraction/vtkExtractRectilinearGrid.h | 2 + .../vtkExtractSelectedArraysOverTime.cxx | 2 + .../vtkExtractSelectedArraysOverTime.h | 2 + .../Extraction/vtkExtractSelectedBlock.cxx | 2 + Filters/Extraction/vtkExtractSelectedBlock.h | 2 + Filters/Extraction/vtkExtractSelectedIds.cxx | 2 + Filters/Extraction/vtkExtractSelectedIds.h | 2 + .../vtkExtractSelectedLocations.cxx | 2 + .../Extraction/vtkExtractSelectedLocations.h | 2 + .../vtkExtractSelectedPolyDataIds.cxx | 2 + .../vtkExtractSelectedPolyDataIds.h | 2 + Filters/Extraction/vtkExtractSelectedRows.cxx | 2 + Filters/Extraction/vtkExtractSelectedRows.h | 2 + .../vtkExtractSelectedThresholds.cxx | 2 + .../Extraction/vtkExtractSelectedThresholds.h | 2 + Filters/Extraction/vtkExtractSelection.cxx | 2 + Filters/Extraction/vtkExtractSelection.h | 2 + .../Extraction/vtkExtractTensorComponents.cxx | 2 + .../Extraction/vtkExtractTensorComponents.h | 2 + Filters/Extraction/vtkExtractTimeSteps.cxx | 2 + Filters/Extraction/vtkExtractTimeSteps.h | 2 + .../Extraction/vtkExtractUnstructuredGrid.cxx | 2 + .../Extraction/vtkExtractUnstructuredGrid.h | 2 + .../Extraction/vtkExtractVectorComponents.cxx | 2 + .../Extraction/vtkExtractVectorComponents.h | 2 + Filters/Extraction/vtkFrustumSelector.cxx | 2 + Filters/Extraction/vtkFrustumSelector.h | 2 + .../vtkHierarchicalDataExtractDataSets.cxx | 2 + .../vtkHierarchicalDataExtractDataSets.h | 2 + .../vtkHierarchicalDataExtractLevel.cxx | 2 + .../vtkHierarchicalDataExtractLevel.h | 2 + Filters/Extraction/vtkLocationSelector.cxx | 2 + Filters/Extraction/vtkLocationSelector.h | 2 + .../Extraction/vtkProbeSelectedLocations.cxx | 2 + .../Extraction/vtkProbeSelectedLocations.h | 2 + Filters/Extraction/vtkSelector.cxx | 2 + Filters/Extraction/vtkSelector.h | 2 + Filters/Extraction/vtkValueSelector.cxx | 2 + Filters/Extraction/vtkValueSelector.h | 2 + .../vtkAMRInterpolatedVelocityField.cxx | 2 + .../vtkAMRInterpolatedVelocityField.h | 2 + .../vtkAbstractInterpolatedVelocityField.cxx | 2 + .../vtkAbstractInterpolatedVelocityField.h | 2 + .../vtkCachingInterpolatedVelocityField.cxx | 2 + .../vtkCachingInterpolatedVelocityField.h | 2 + ...tkCellLocatorInterpolatedVelocityField.cxx | 2 + .../vtkCellLocatorInterpolatedVelocityField.h | 2 + .../vtkCompositeInterpolatedVelocityField.cxx | 2 + .../vtkCompositeInterpolatedVelocityField.h | 2 + .../vtkEvenlySpacedStreamlines2D.cxx | 2 + .../FlowPaths/vtkEvenlySpacedStreamlines2D.h | 2 + .../vtkInterpolatedVelocityField.cxx | 2 + .../FlowPaths/vtkInterpolatedVelocityField.h | 2 + .../vtkLagrangianBasicIntegrationModel.cxx | 2 + .../vtkLagrangianBasicIntegrationModel.h | 2 + .../vtkLagrangianMatidaIntegrationModel.cxx | 2 + .../vtkLagrangianMatidaIntegrationModel.h | 2 + Filters/FlowPaths/vtkLagrangianParticle.cxx | 2 + Filters/FlowPaths/vtkLagrangianParticle.h | 2 + .../vtkLagrangianParticleTracker.cxx | 2 + .../FlowPaths/vtkLagrangianParticleTracker.h | 2 + Filters/FlowPaths/vtkLagrangianThreadedData.h | 2 + .../vtkLinearTransformCellLocator.cxx | 2 + .../FlowPaths/vtkLinearTransformCellLocator.h | 3 + Filters/FlowPaths/vtkModifiedBSPTree.cxx | 2 + Filters/FlowPaths/vtkModifiedBSPTree.h | 2 + Filters/FlowPaths/vtkParallelVectors.cxx | 8 + Filters/FlowPaths/vtkParallelVectors.h | 4 + Filters/FlowPaths/vtkParticlePathFilter.cxx | 2 + Filters/FlowPaths/vtkParticlePathFilter.h | 2 + Filters/FlowPaths/vtkParticleTracer.cxx | 2 + Filters/FlowPaths/vtkParticleTracer.h | 2 + Filters/FlowPaths/vtkParticleTracerBase.cxx | 8 + Filters/FlowPaths/vtkParticleTracerBase.h | 6 + Filters/FlowPaths/vtkStreaklineFilter.cxx | 2 + Filters/FlowPaths/vtkStreaklineFilter.h | 2 + Filters/FlowPaths/vtkStreamSurface.cxx | 2 + Filters/FlowPaths/vtkStreamSurface.h | 2 + Filters/FlowPaths/vtkStreamTracer.cxx | 2 + Filters/FlowPaths/vtkStreamTracer.h | 4 + .../vtkTemporalInterpolatedVelocityField.cxx | 2 + .../vtkTemporalInterpolatedVelocityField.h | 2 + Filters/FlowPaths/vtkVectorFieldTopology.cxx | 2 + Filters/FlowPaths/vtkVectorFieldTopology.h | 2 + Filters/FlowPaths/vtkVortexCore.cxx | 2 + Filters/FlowPaths/vtkVortexCore.h | 2 + Filters/General/vtkAnimateModes.cxx | 2 + Filters/General/vtkAnimateModes.h | 2 + Filters/General/vtkAnnotationLink.cxx | 2 + Filters/General/vtkAnnotationLink.h | 2 + .../General/vtkAppendLocationAttributes.cxx | 2 + Filters/General/vtkAppendLocationAttributes.h | 2 + Filters/General/vtkAppendPoints.cxx | 2 + Filters/General/vtkAppendPoints.h | 2 + .../vtkApproximatingSubdivisionFilter.cxx | 2 + .../vtkApproximatingSubdivisionFilter.h | 2 + .../General/vtkAreaContourSpectrumFilter.cxx | 2 + .../General/vtkAreaContourSpectrumFilter.h | 2 + Filters/General/vtkAxes.cxx | 2 + Filters/General/vtkAxes.h | 2 + Filters/General/vtkBlankStructuredGrid.cxx | 2 + Filters/General/vtkBlankStructuredGrid.h | 2 + .../vtkBlankStructuredGridWithImage.cxx | 2 + .../General/vtkBlankStructuredGridWithImage.h | 2 + Filters/General/vtkBlockIdScalars.cxx | 2 + Filters/General/vtkBlockIdScalars.h | 2 + .../vtkBooleanOperationPolyDataFilter.cxx | 2 + .../vtkBooleanOperationPolyDataFilter.h | 2 + Filters/General/vtkBoxClipDataSet.cxx | 2 + Filters/General/vtkBoxClipDataSet.h | 2 + Filters/General/vtkBrownianPoints.cxx | 2 + Filters/General/vtkBrownianPoints.h | 2 + Filters/General/vtkCellDerivatives.cxx | 2 + Filters/General/vtkCellDerivatives.h | 2 + Filters/General/vtkCellValidator.cxx | 2 + Filters/General/vtkCellValidator.h | 2 + Filters/General/vtkClipClosedSurface.cxx | 2 + Filters/General/vtkClipClosedSurface.h | 2 + Filters/General/vtkClipConvexPolyData.cxx | 2 + Filters/General/vtkClipConvexPolyData.h | 2 + Filters/General/vtkClipDataSet.cxx | 2 + Filters/General/vtkClipDataSet.h | 2 + Filters/General/vtkClipVolume.cxx | 2 + Filters/General/vtkClipVolume.h | 2 + Filters/General/vtkCoincidentPoints.cxx | 2 + Filters/General/vtkCoincidentPoints.h | 2 + Filters/General/vtkContourTriangulator.cxx | 2 + Filters/General/vtkContourTriangulator.h | 2 + Filters/General/vtkCountFaces.cxx | 2 + Filters/General/vtkCountFaces.h | 2 + Filters/General/vtkCountVertices.cxx | 2 + Filters/General/vtkCountVertices.h | 2 + Filters/General/vtkCursor2D.cxx | 2 + Filters/General/vtkCursor2D.h | 2 + Filters/General/vtkCursor3D.cxx | 2 + Filters/General/vtkCursor3D.h | 2 + Filters/General/vtkCurvatures.cxx | 2 + Filters/General/vtkCurvatures.h | 2 + Filters/General/vtkDataSetGradient.cxx | 2 + Filters/General/vtkDataSetGradient.h | 2 + .../General/vtkDataSetGradientPrecompute.cxx | 2 + .../General/vtkDataSetGradientPrecompute.h | 2 + Filters/General/vtkDataSetTriangleFilter.cxx | 2 + Filters/General/vtkDataSetTriangleFilter.h | 2 + Filters/General/vtkDateToNumeric.cxx | 2 + Filters/General/vtkDateToNumeric.h | 2 + Filters/General/vtkDeflectNormals.cxx | 2 + Filters/General/vtkDeflectNormals.h | 2 + Filters/General/vtkDeformPointSet.cxx | 2 + Filters/General/vtkDeformPointSet.h | 2 + Filters/General/vtkDensifyPolyData.cxx | 2 + Filters/General/vtkDensifyPolyData.h | 2 + Filters/General/vtkDicer.cxx | 2 + Filters/General/vtkDicer.h | 2 + Filters/General/vtkDiscreteFlyingEdges2D.cxx | 2 + Filters/General/vtkDiscreteFlyingEdges2D.h | 2 + Filters/General/vtkDiscreteFlyingEdges3D.cxx | 2 + Filters/General/vtkDiscreteFlyingEdges3D.h | 2 + .../vtkDiscreteFlyingEdgesClipper2D.cxx | 2 + .../General/vtkDiscreteFlyingEdgesClipper2D.h | 2 + Filters/General/vtkDiscreteMarchingCubes.cxx | 2 + Filters/General/vtkDiscreteMarchingCubes.h | 2 + Filters/General/vtkDistancePolyDataFilter.cxx | 2 + Filters/General/vtkDistancePolyDataFilter.h | 2 + Filters/General/vtkEdgePoints.cxx | 2 + Filters/General/vtkEdgePoints.h | 2 + Filters/General/vtkEqualizerFilter.cxx | 2 + Filters/General/vtkEqualizerFilter.h | 2 + Filters/General/vtkExtractArray.cxx | 2 + Filters/General/vtkExtractArray.h | 2 + Filters/General/vtkExtractGhostCells.cxx | 2 + Filters/General/vtkExtractGhostCells.h | 2 + Filters/General/vtkExtractSelectedFrustum.cxx | 2 + Filters/General/vtkExtractSelectedFrustum.h | 2 + Filters/General/vtkExtractSelectionBase.cxx | 2 + Filters/General/vtkExtractSelectionBase.h | 2 + .../vtkFiniteElementFieldDistributor.cxx | 3 + .../vtkFiniteElementFieldDistributor.h | 2 + Filters/General/vtkGradientFilter.cxx | 5 + Filters/General/vtkGradientFilter.h | 2 + Filters/General/vtkGraphLayoutFilter.cxx | 2 + Filters/General/vtkGraphLayoutFilter.h | 2 + Filters/General/vtkGraphToPoints.cxx | 2 + Filters/General/vtkGraphToPoints.h | 2 + .../vtkGraphWeightEuclideanDistanceFilter.cxx | 2 + .../vtkGraphWeightEuclideanDistanceFilter.h | 2 + Filters/General/vtkGraphWeightFilter.cxx | 2 + Filters/General/vtkGraphWeightFilter.h | 2 + Filters/General/vtkGroupDataSetsFilter.cxx | 2 + Filters/General/vtkGroupDataSetsFilter.h | 2 + Filters/General/vtkGroupTimeStepsFilter.cxx | 2 + Filters/General/vtkGroupTimeStepsFilter.h | 2 + .../vtkHierarchicalDataLevelFilter.cxx | 2 + .../General/vtkHierarchicalDataLevelFilter.h | 2 + Filters/General/vtkHyperStreamline.cxx | 2 + Filters/General/vtkHyperStreamline.h | 2 + Filters/General/vtkIconGlyphFilter.cxx | 2 + Filters/General/vtkIconGlyphFilter.h | 2 + Filters/General/vtkImageDataToPointSet.cxx | 2 + Filters/General/vtkImageDataToPointSet.h | 2 + Filters/General/vtkImageMarchingCubes.cxx | 2 + Filters/General/vtkImageMarchingCubes.h | 2 + .../vtkInterpolateDataSetAttributes.cxx | 2 + .../General/vtkInterpolateDataSetAttributes.h | 2 + .../vtkInterpolatingSubdivisionFilter.cxx | 2 + .../vtkInterpolatingSubdivisionFilter.h | 2 + .../General/vtkIntersectionPolyDataFilter.cxx | 2 + .../General/vtkIntersectionPolyDataFilter.h | 2 + Filters/General/vtkJoinTables.cxx | 2 + Filters/General/vtkJoinTables.h | 2 + Filters/General/vtkJoinTables.txx | 2 + Filters/General/vtkLevelIdScalars.cxx | 2 + Filters/General/vtkLevelIdScalars.h | 2 + Filters/General/vtkLinkEdgels.cxx | 2 + Filters/General/vtkLinkEdgels.h | 2 + .../General/vtkLoopBooleanPolyDataFilter.cxx | 2 + .../General/vtkLoopBooleanPolyDataFilter.h | 2 + Filters/General/vtkMarchingContourFilter.cxx | 2 + Filters/General/vtkMarchingContourFilter.h | 2 + Filters/General/vtkMatricizeArray.cxx | 2 + Filters/General/vtkMatricizeArray.h | 2 + Filters/General/vtkMergeArrays.cxx | 2 + Filters/General/vtkMergeArrays.h | 2 + Filters/General/vtkMergeCells.cxx | 2 + Filters/General/vtkMergeCells.h | 2 + Filters/General/vtkMergeTimeFilter.cxx | 2 + Filters/General/vtkMergeTimeFilter.h | 2 + Filters/General/vtkMergeVectorComponents.cxx | 2 + Filters/General/vtkMergeVectorComponents.h | 2 + .../General/vtkMultiBlockDataGroupFilter.cxx | 2 + .../General/vtkMultiBlockDataGroupFilter.h | 2 + Filters/General/vtkMultiBlockMergeFilter.cxx | 2 + Filters/General/vtkMultiBlockMergeFilter.h | 2 + Filters/General/vtkMultiThreshold.cxx | 2 + Filters/General/vtkMultiThreshold.h | 2 + .../vtkNonOverlappingAMRLevelIdScalars.cxx | 2 + .../vtkNonOverlappingAMRLevelIdScalars.h | 2 + Filters/General/vtkNormalizeMatrixVectors.cxx | 2 + Filters/General/vtkNormalizeMatrixVectors.h | 2 + Filters/General/vtkOBBDicer.cxx | 2 + Filters/General/vtkOBBDicer.h | 2 + Filters/General/vtkOBBTree.cxx | 2 + Filters/General/vtkOBBTree.h | 2 + .../vtkOverlappingAMRLevelIdScalars.cxx | 2 + .../General/vtkOverlappingAMRLevelIdScalars.h | 2 + Filters/General/vtkPassArrays.cxx | 2 + Filters/General/vtkPassArrays.h | 2 + Filters/General/vtkPassSelectedArrays.cxx | 2 + Filters/General/vtkPassSelectedArrays.h | 2 + .../General/vtkPointConnectivityFilter.cxx | 2 + Filters/General/vtkPointConnectivityFilter.h | 2 + Filters/General/vtkPolyDataStreamer.cxx | 2 + Filters/General/vtkPolyDataStreamer.h | 2 + .../General/vtkPolyDataToReebGraphFilter.cxx | 2 + .../General/vtkPolyDataToReebGraphFilter.h | 2 + Filters/General/vtkProbePolyhedron.cxx | 2 + Filters/General/vtkProbePolyhedron.h | 2 + .../vtkQuadraturePointInterpolator.cxx | 2 + .../General/vtkQuadraturePointInterpolator.h | 2 + .../General/vtkQuadraturePointsGenerator.cxx | 2 + .../General/vtkQuadraturePointsGenerator.h | 2 + .../General/vtkQuadraturePointsUtilities.hxx | 4 +- ...vtkQuadratureSchemeDictionaryGenerator.cxx | 2 + .../vtkQuadratureSchemeDictionaryGenerator.h | 2 + Filters/General/vtkQuantizePolyDataPoints.cxx | 2 + Filters/General/vtkQuantizePolyDataPoints.h | 2 + .../General/vtkRandomAttributeGenerator.cxx | 2 + Filters/General/vtkRandomAttributeGenerator.h | 2 + Filters/General/vtkRectilinearGridClip.cxx | 2 + Filters/General/vtkRectilinearGridClip.h | 2 + .../General/vtkRectilinearGridToPointSet.cxx | 2 + .../General/vtkRectilinearGridToPointSet.h | 2 + .../vtkRectilinearGridToTetrahedra.cxx | 2 + .../General/vtkRectilinearGridToTetrahedra.h | 2 + Filters/General/vtkRecursiveDividingCubes.cxx | 2 + Filters/General/vtkRecursiveDividingCubes.h | 2 + Filters/General/vtkReflectionFilter.cxx | 2 + Filters/General/vtkReflectionFilter.h | 2 + Filters/General/vtkRemovePolyData.cxx | 2 + Filters/General/vtkRemovePolyData.h | 2 + Filters/General/vtkRotationFilter.cxx | 2 + Filters/General/vtkRotationFilter.h | 2 + .../vtkSampleImplicitFunctionFilter.cxx | 2 + .../General/vtkSampleImplicitFunctionFilter.h | 2 + Filters/General/vtkShrinkFilter.cxx | 2 + Filters/General/vtkShrinkFilter.h | 2 + Filters/General/vtkShrinkPolyData.cxx | 2 + Filters/General/vtkShrinkPolyData.h | 2 + .../vtkSpatialRepresentationFilter.cxx | 2 + .../General/vtkSpatialRepresentationFilter.h | 2 + Filters/General/vtkSphericalHarmonics.cxx | 2 + Filters/General/vtkSphericalHarmonics.h | 2 + Filters/General/vtkSplineFilter.cxx | 2 + Filters/General/vtkSplineFilter.h | 2 + .../General/vtkSplitByCellScalarFilter.cxx | 2 + Filters/General/vtkSplitByCellScalarFilter.h | 2 + Filters/General/vtkSplitColumnComponents.cxx | 2 + Filters/General/vtkSplitColumnComponents.h | 2 + Filters/General/vtkSplitField.cxx | 2 + Filters/General/vtkSplitField.h | 2 + Filters/General/vtkStructuredGridClip.cxx | 2 + Filters/General/vtkStructuredGridClip.h | 2 + Filters/General/vtkSubPixelPositionEdgels.cxx | 2 + Filters/General/vtkSubPixelPositionEdgels.h | 2 + Filters/General/vtkSubdivisionFilter.cxx | 2 + Filters/General/vtkSubdivisionFilter.h | 2 + Filters/General/vtkSynchronizeTimeFilter.cxx | 2 + Filters/General/vtkSynchronizeTimeFilter.h | 2 + Filters/General/vtkTableBasedClipCases.cxx | 8 +- Filters/General/vtkTableBasedClipDataSet.cxx | 2 + Filters/General/vtkTableBasedClipDataSet.h | 2 + Filters/General/vtkTableFFT.cxx | 4 + Filters/General/vtkTableFFT.h | 3 + Filters/General/vtkTableToPolyData.cxx | 2 + Filters/General/vtkTableToPolyData.h | 2 + Filters/General/vtkTableToStructuredGrid.cxx | 2 + Filters/General/vtkTableToStructuredGrid.h | 2 + Filters/General/vtkTemporalPathLineFilter.cxx | 2 + Filters/General/vtkTemporalPathLineFilter.h | 4 + Filters/General/vtkTemporalStatistics.cxx | 2 + Filters/General/vtkTemporalStatistics.h | 2 + Filters/General/vtkTessellatorFilter.cxx | 2 + Filters/General/vtkTessellatorFilter.h | 2 + Filters/General/vtkTimeSourceExample.cxx | 2 + Filters/General/vtkTimeSourceExample.h | 2 + Filters/General/vtkTransformFilter.cxx | 2 + Filters/General/vtkTransformFilter.h | 2 + .../General/vtkTransformPolyDataFilter.cxx | 2 + Filters/General/vtkTransformPolyDataFilter.h | 2 + Filters/General/vtkUncertaintyTubeFilter.cxx | 2 + Filters/General/vtkUncertaintyTubeFilter.h | 2 + Filters/General/vtkVertexGlyphFilter.cxx | 2 + Filters/General/vtkVertexGlyphFilter.h | 2 + .../vtkVolumeContourSpectrumFilter.cxx | 2 + .../General/vtkVolumeContourSpectrumFilter.h | 2 + .../vtkVoxelContoursToSurfaceFilter.cxx | 2 + .../General/vtkVoxelContoursToSurfaceFilter.h | 2 + Filters/General/vtkWarpLens.cxx | 2 + Filters/General/vtkWarpLens.h | 2 + Filters/General/vtkWarpScalar.cxx | 2 + Filters/General/vtkWarpScalar.h | 2 + Filters/General/vtkWarpTo.cxx | 2 + Filters/General/vtkWarpTo.h | 2 + Filters/General/vtkWarpVector.cxx | 2 + Filters/General/vtkWarpVector.h | 2 + .../General/vtkYoungsMaterialInterface.cxx | 8 +- Filters/General/vtkYoungsMaterialInterface.h | 2 + Filters/Generic/vtkGenericClip.cxx | 2 + Filters/Generic/vtkGenericClip.h | 2 + Filters/Generic/vtkGenericContourFilter.cxx | 2 + Filters/Generic/vtkGenericContourFilter.h | 2 + Filters/Generic/vtkGenericCutter.cxx | 2 + Filters/Generic/vtkGenericCutter.h | 2 + .../Generic/vtkGenericDataSetTessellator.cxx | 2 + .../Generic/vtkGenericDataSetTessellator.h | 2 + Filters/Generic/vtkGenericGeometryFilter.cxx | 2 + Filters/Generic/vtkGenericGeometryFilter.h | 2 + Filters/Generic/vtkGenericGlyph3DFilter.cxx | 2 + Filters/Generic/vtkGenericGlyph3DFilter.h | 2 + Filters/Generic/vtkGenericOutlineFilter.cxx | 2 + Filters/Generic/vtkGenericOutlineFilter.h | 2 + Filters/Generic/vtkGenericProbeFilter.cxx | 2 + Filters/Generic/vtkGenericProbeFilter.h | 2 + Filters/Generic/vtkGenericStreamTracer.cxx | 2 + Filters/Generic/vtkGenericStreamTracer.h | 2 + .../Geometry/vtkAbstractGridConnectivity.cxx | 2 + .../Geometry/vtkAbstractGridConnectivity.h | 4 + .../Geometry/vtkAttributeSmoothingFilter.cxx | 4 + .../Geometry/vtkAttributeSmoothingFilter.h | 2 + .../vtkCompositeDataGeometryFilter.cxx | 2 + .../Geometry/vtkCompositeDataGeometryFilter.h | 2 + .../vtkDataSetRegionSurfaceFilter.cxx | 2 + .../Geometry/vtkDataSetRegionSurfaceFilter.h | 2 + Filters/Geometry/vtkDataSetSurfaceFilter.cxx | 2 + Filters/Geometry/vtkDataSetSurfaceFilter.h | 2 + ...vtkExplicitStructuredGridSurfaceFilter.cxx | 2 + .../vtkExplicitStructuredGridSurfaceFilter.h | 2 + Filters/Geometry/vtkGeometryFilter.cxx | 2 + Filters/Geometry/vtkGeometryFilter.h | 2 + .../vtkHierarchicalDataSetGeometryFilter.cxx | 2 + .../vtkHierarchicalDataSetGeometryFilter.h | 2 + .../Geometry/vtkImageDataGeometryFilter.cxx | 2 + Filters/Geometry/vtkImageDataGeometryFilter.h | 2 + .../Geometry/vtkImageDataToUniformGrid.cxx | 2 + Filters/Geometry/vtkImageDataToUniformGrid.h | 2 + .../vtkLinearToQuadraticCellsFilter.cxx | 2 + .../vtkLinearToQuadraticCellsFilter.h | 2 + Filters/Geometry/vtkMarkBoundaryFilter.cxx | 2 + Filters/Geometry/vtkMarkBoundaryFilter.h | 2 + Filters/Geometry/vtkProjectSphereFilter.cxx | 2 + Filters/Geometry/vtkProjectSphereFilter.h | 2 + .../vtkRectilinearGridGeometryFilter.cxx | 2 + .../vtkRectilinearGridGeometryFilter.h | 2 + .../vtkRectilinearGridPartitioner.cxx | 2 + .../Geometry/vtkRectilinearGridPartitioner.h | 2 + .../vtkStructuredAMRGridConnectivity.cxx | 4 + .../vtkStructuredAMRGridConnectivity.h | 2 + Filters/Geometry/vtkStructuredAMRNeighbor.cxx | 2 + Filters/Geometry/vtkStructuredAMRNeighbor.h | 2 + .../vtkStructuredGridConnectivity.cxx | 6 + .../Geometry/vtkStructuredGridConnectivity.h | 2 + .../vtkStructuredGridGeometryFilter.cxx | 2 + .../vtkStructuredGridGeometryFilter.h | 2 + .../Geometry/vtkStructuredGridPartitioner.cxx | 2 + .../Geometry/vtkStructuredGridPartitioner.h | 2 + Filters/Geometry/vtkStructuredNeighbor.cxx | 2 + Filters/Geometry/vtkStructuredNeighbor.h | 2 + .../vtkStructuredPointsGeometryFilter.cxx | 2 + .../vtkStructuredPointsGeometryFilter.h | 2 + .../vtkUnstructuredGridGeometryFilter.cxx | 2 + .../vtkUnstructuredGridGeometryFilter.h | 2 + .../vtkOctreeImageToPointSetFilter.cxx | 2 + .../vtkOctreeImageToPointSetFilter.h | 2 + .../GeometryPreview/vtkPointSetStreamer.cxx | 2 + Filters/GeometryPreview/vtkPointSetStreamer.h | 2 + .../vtkPointSetToOctreeImageFilter.cxx | 2 + .../vtkPointSetToOctreeImageFilter.h | 2 + .../vtkAdaptiveDataSetSurfaceFilter.cxx | 2 + .../Hybrid/vtkAdaptiveDataSetSurfaceFilter.h | 2 + Filters/Hybrid/vtkBSplineTransform.cxx | 2 + Filters/Hybrid/vtkBSplineTransform.h | 2 + Filters/Hybrid/vtkDSPFilterDefinition.cxx | 2 + Filters/Hybrid/vtkDSPFilterDefinition.h | 2 + Filters/Hybrid/vtkDSPFilterGroup.cxx | 2 + Filters/Hybrid/vtkDSPFilterGroup.h | 2 + Filters/Hybrid/vtkDepthSortPolyData.cxx | 2 + Filters/Hybrid/vtkDepthSortPolyData.h | 2 + Filters/Hybrid/vtkEarthSource.cxx | 4 + Filters/Hybrid/vtkEarthSource.h | 2 + Filters/Hybrid/vtkEarthSourceData.cxx | 2 + Filters/Hybrid/vtkFacetReader.cxx | 2 + Filters/Hybrid/vtkFacetReader.h | 2 + Filters/Hybrid/vtkForceTime.cxx | 2 + Filters/Hybrid/vtkForceTime.h | 2 + Filters/Hybrid/vtkGenerateTimeSteps.cxx | 2 + Filters/Hybrid/vtkGenerateTimeSteps.h | 2 + Filters/Hybrid/vtkGreedyTerrainDecimation.cxx | 2 + Filters/Hybrid/vtkGreedyTerrainDecimation.h | 2 + Filters/Hybrid/vtkGridTransform.cxx | 2 + Filters/Hybrid/vtkGridTransform.h | 2 + Filters/Hybrid/vtkImageToPolyDataFilter.cxx | 2 + Filters/Hybrid/vtkImageToPolyDataFilter.h | 2 + Filters/Hybrid/vtkImplicitModeller.cxx | 2 + Filters/Hybrid/vtkImplicitModeller.h | 2 + Filters/Hybrid/vtkPCAAnalysisFilter.cxx | 2 + Filters/Hybrid/vtkPCAAnalysisFilter.h | 2 + Filters/Hybrid/vtkPolyDataSilhouette.cxx | 2 + Filters/Hybrid/vtkPolyDataSilhouette.h | 2 + .../Hybrid/vtkProcrustesAlignmentFilter.cxx | 2 + Filters/Hybrid/vtkProcrustesAlignmentFilter.h | 2 + Filters/Hybrid/vtkProjectedTerrainPath.cxx | 2 + Filters/Hybrid/vtkProjectedTerrainPath.h | 2 + Filters/Hybrid/vtkRenderLargeImage.cxx | 2 + Filters/Hybrid/vtkRenderLargeImage.h | 2 + .../Hybrid/vtkTemporalArrayOperatorFilter.cxx | 2 + .../Hybrid/vtkTemporalArrayOperatorFilter.h | 2 + Filters/Hybrid/vtkTemporalDataSetCache.cxx | 2 + Filters/Hybrid/vtkTemporalDataSetCache.h | 2 + Filters/Hybrid/vtkTemporalFractal.cxx | 2 + Filters/Hybrid/vtkTemporalFractal.h | 2 + Filters/Hybrid/vtkTemporalInterpolator.cxx | 2 + Filters/Hybrid/vtkTemporalInterpolator.h | 2 + Filters/Hybrid/vtkTemporalShiftScale.cxx | 2 + Filters/Hybrid/vtkTemporalShiftScale.h | 2 + Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx | 2 + Filters/Hybrid/vtkTemporalSnapToTimeStep.h | 2 + Filters/Hybrid/vtkTransformToGrid.cxx | 2 + Filters/Hybrid/vtkTransformToGrid.h | 2 + Filters/Hybrid/vtkWeightedTransformFilter.cxx | 2 + Filters/Hybrid/vtkWeightedTransformFilter.h | 2 + .../HyperTree/vtkHyperTreeGridAxisClip.cxx | 2 + Filters/HyperTree/vtkHyperTreeGridAxisClip.h | 2 + Filters/HyperTree/vtkHyperTreeGridAxisCut.cxx | 2 + Filters/HyperTree/vtkHyperTreeGridAxisCut.h | 2 + .../vtkHyperTreeGridAxisReflection.cxx | 2 + .../vtkHyperTreeGridAxisReflection.h | 2 + .../HyperTree/vtkHyperTreeGridCellCenters.cxx | 2 + .../HyperTree/vtkHyperTreeGridCellCenters.h | 2 + Filters/HyperTree/vtkHyperTreeGridContour.cxx | 2 + Filters/HyperTree/vtkHyperTreeGridContour.h | 2 + .../vtkHyperTreeGridDepthLimiter.cxx | 2 + .../HyperTree/vtkHyperTreeGridDepthLimiter.h | 2 + .../vtkHyperTreeGridEvaluateCoarse.cxx | 2 + .../vtkHyperTreeGridEvaluateCoarse.h | 2 + .../HyperTree/vtkHyperTreeGridGeometry.cxx | 2 + Filters/HyperTree/vtkHyperTreeGridGeometry.h | 2 + .../HyperTree/vtkHyperTreeGridGradient.cxx | 4 + Filters/HyperTree/vtkHyperTreeGridGradient.h | 3 + .../HyperTree/vtkHyperTreeGridPlaneCutter.cxx | 2 + .../HyperTree/vtkHyperTreeGridPlaneCutter.h | 2 + .../HyperTree/vtkHyperTreeGridThreshold.cxx | 2 + Filters/HyperTree/vtkHyperTreeGridThreshold.h | 2 + .../HyperTree/vtkHyperTreeGridToDualGrid.cxx | 2 + .../HyperTree/vtkHyperTreeGridToDualGrid.h | 2 + .../vtkHyperTreeGridToUnstructuredGrid.cxx | 2 + .../vtkHyperTreeGridToUnstructuredGrid.h | 2 + .../HyperTree/vtkImageDataToHyperTreeGrid.cxx | 2 + .../HyperTree/vtkImageDataToHyperTreeGrid.h | 2 + .../Imaging/vtkComputeHistogram2DOutliers.cxx | 2 + .../Imaging/vtkComputeHistogram2DOutliers.h | 2 + Filters/Imaging/vtkExtractHistogram2D.cxx | 2 + Filters/Imaging/vtkExtractHistogram2D.h | 2 + .../Imaging/vtkPairwiseExtractHistogram2D.cxx | 2 + .../Imaging/vtkPairwiseExtractHistogram2D.h | 2 + .../Modeling/vtkAdaptiveSubdivisionFilter.cxx | 2 + .../Modeling/vtkAdaptiveSubdivisionFilter.h | 2 + .../vtkBandedPolyDataContourFilter.cxx | 2 + .../Modeling/vtkBandedPolyDataContourFilter.h | 2 + .../vtkButterflySubdivisionFilter.cxx | 2 + .../Modeling/vtkButterflySubdivisionFilter.h | 2 + .../Modeling/vtkCollisionDetectionFilter.cxx | 2 + .../Modeling/vtkCollisionDetectionFilter.h | 2 + Filters/Modeling/vtkContourLoopExtraction.cxx | 2 + Filters/Modeling/vtkContourLoopExtraction.h | 2 + Filters/Modeling/vtkCookieCutter.cxx | 2 + Filters/Modeling/vtkCookieCutter.h | 2 + .../Modeling/vtkDijkstraGraphGeodesicPath.cxx | 2 + .../Modeling/vtkDijkstraGraphGeodesicPath.h | 2 + Filters/Modeling/vtkDijkstraGraphInternals.h | 2 + .../Modeling/vtkDijkstraImageGeodesicPath.cxx | 2 + .../Modeling/vtkDijkstraImageGeodesicPath.h | 2 + Filters/Modeling/vtkFillHolesFilter.cxx | 2 + Filters/Modeling/vtkFillHolesFilter.h | 2 + Filters/Modeling/vtkFitToHeightMapFilter.cxx | 2 + Filters/Modeling/vtkFitToHeightMapFilter.h | 2 + Filters/Modeling/vtkGeodesicPath.cxx | 2 + Filters/Modeling/vtkGeodesicPath.h | 2 + Filters/Modeling/vtkGraphGeodesicPath.cxx | 2 + Filters/Modeling/vtkGraphGeodesicPath.h | 2 + .../vtkHausdorffDistancePointSetFilter.cxx | 2 + .../vtkHausdorffDistancePointSetFilter.h | 2 + .../vtkHyperTreeGridOutlineFilter.cxx | 2 + .../Modeling/vtkHyperTreeGridOutlineFilter.h | 2 + .../Modeling/vtkImageDataOutlineFilter.cxx | 2 + Filters/Modeling/vtkImageDataOutlineFilter.h | 2 + Filters/Modeling/vtkImprintFilter.cxx | 2 + Filters/Modeling/vtkImprintFilter.h | 2 + .../Modeling/vtkLinearCellExtrusionFilter.cxx | 2 + .../Modeling/vtkLinearCellExtrusionFilter.h | 2 + Filters/Modeling/vtkLinearExtrusionFilter.cxx | 2 + Filters/Modeling/vtkLinearExtrusionFilter.h | 2 + .../Modeling/vtkLinearSubdivisionFilter.cxx | 2 + Filters/Modeling/vtkLinearSubdivisionFilter.h | 2 + Filters/Modeling/vtkLoopSubdivisionFilter.cxx | 2 + Filters/Modeling/vtkLoopSubdivisionFilter.h | 2 + Filters/Modeling/vtkOutlineFilter.cxx | 2 + Filters/Modeling/vtkOutlineFilter.h | 2 + Filters/Modeling/vtkPolyDataPointSampler.cxx | 2 + Filters/Modeling/vtkPolyDataPointSampler.h | 2 + Filters/Modeling/vtkProjectedTexture.cxx | 2 + Filters/Modeling/vtkProjectedTexture.h | 2 + .../vtkQuadRotationalExtrusionFilter.cxx | 2 + .../vtkQuadRotationalExtrusionFilter.h | 2 + Filters/Modeling/vtkRibbonFilter.cxx | 2 + Filters/Modeling/vtkRibbonFilter.h | 2 + .../Modeling/vtkRotationalExtrusionFilter.cxx | 2 + .../Modeling/vtkRotationalExtrusionFilter.h | 2 + Filters/Modeling/vtkRuledSurfaceFilter.cxx | 2 + Filters/Modeling/vtkRuledSurfaceFilter.h | 2 + Filters/Modeling/vtkSectorSource.cxx | 2 + Filters/Modeling/vtkSectorSource.h | 2 + Filters/Modeling/vtkSelectEnclosedPoints.cxx | 2 + Filters/Modeling/vtkSelectEnclosedPoints.h | 2 + Filters/Modeling/vtkSelectPolyData.cxx | 2 + Filters/Modeling/vtkSelectPolyData.h | 2 + Filters/Modeling/vtkSpherePuzzle.cxx | 2 + Filters/Modeling/vtkSpherePuzzle.h | 2 + Filters/Modeling/vtkSpherePuzzleArrows.cxx | 2 + Filters/Modeling/vtkSpherePuzzleArrows.h | 2 + Filters/Modeling/vtkSubdivideTetra.cxx | 2 + Filters/Modeling/vtkSubdivideTetra.h | 2 + .../Modeling/vtkTrimmedExtrusionFilter.cxx | 2 + Filters/Modeling/vtkTrimmedExtrusionFilter.h | 2 + .../Modeling/vtkVolumeOfRevolutionFilter.cxx | 2 + .../Modeling/vtkVolumeOfRevolutionFilter.h | 2 + Filters/OpenTURNS/vtkOTDensityMap.cxx | 6 +- Filters/OpenTURNS/vtkOTDensityMap.h | 2 + Filters/OpenTURNS/vtkOTFilter.cxx | 2 + Filters/OpenTURNS/vtkOTFilter.h | 2 + Filters/OpenTURNS/vtkOTKernelSmoothing.cxx | 6 +- Filters/OpenTURNS/vtkOTKernelSmoothing.h | 2 + Filters/OpenTURNS/vtkOTScatterPlotMatrix.cxx | 2 + Filters/OpenTURNS/vtkOTScatterPlotMatrix.h | 2 + Filters/OpenTURNS/vtkOTUtilities.cxx | 2 + Filters/OpenTURNS/vtkOTUtilities.h | 5 + .../vtkAdaptiveTemporalInterpolator.cxx | 2 + .../vtkAdaptiveTemporalInterpolator.h | 2 + .../Parallel/vtkAggregateDataSetFilter.cxx | 2 + Filters/Parallel/vtkAggregateDataSetFilter.h | 2 + .../Parallel/vtkAlignImageDataSetFilter.cxx | 2 + Filters/Parallel/vtkAlignImageDataSetFilter.h | 2 + Filters/Parallel/vtkAngularPeriodicFilter.cxx | 2 + Filters/Parallel/vtkAngularPeriodicFilter.h | 2 + Filters/Parallel/vtkBlockDistribution.h | 4 + Filters/Parallel/vtkCollectGraph.cxx | 2 + Filters/Parallel/vtkCollectGraph.h | 2 + Filters/Parallel/vtkCollectPolyData.cxx | 2 + Filters/Parallel/vtkCollectPolyData.h | 2 + Filters/Parallel/vtkCollectTable.cxx | 2 + Filters/Parallel/vtkCollectTable.h | 2 + Filters/Parallel/vtkCutMaterial.cxx | 2 + Filters/Parallel/vtkCutMaterial.h | 2 + Filters/Parallel/vtkDistributedDataFilter.cxx | 2 + Filters/Parallel/vtkDistributedDataFilter.h | 2 + Filters/Parallel/vtkDuplicatePolyData.cxx | 2 + Filters/Parallel/vtkDuplicatePolyData.h | 2 + Filters/Parallel/vtkExtractCTHPart.cxx | 2 + Filters/Parallel/vtkExtractCTHPart.h | 2 + Filters/Parallel/vtkExtractPolyDataPiece.cxx | 2 + Filters/Parallel/vtkExtractPolyDataPiece.h | 2 + .../vtkExtractUnstructuredGridPiece.cxx | 2 + .../vtkExtractUnstructuredGridPiece.h | 2 + .../Parallel/vtkExtractUserDefinedPiece.cxx | 2 + Filters/Parallel/vtkExtractUserDefinedPiece.h | 2 + .../vtkHyperTreeGridGhostCellsGenerator.cxx | 2 + .../vtkHyperTreeGridGhostCellsGenerator.h | 2 + .../Parallel/vtkHyperTreeGridPProbeFilter.cxx | 490 ++++++++++++++++++ Filters/Parallel/vtkIntegrateAttributes.cxx | 2 + Filters/Parallel/vtkIntegrateAttributes.h | 2 + Filters/Parallel/vtkPCellDataToPointData.cxx | 4 + Filters/Parallel/vtkPCellDataToPointData.h | 2 + .../vtkPConvertToMultiBlockDataSet.cxx | 2 + .../Parallel/vtkPConvertToMultiBlockDataSet.h | 2 + .../vtkPExtractDataArraysOverTime.cxx | 2 + .../Parallel/vtkPExtractDataArraysOverTime.h | 2 + ...kPExtractExodusGlobalTemporalVariables.cxx | 2 + ...vtkPExtractExodusGlobalTemporalVariables.h | 2 + .../vtkPExtractSelectedArraysOverTime.cxx | 2 + .../vtkPExtractSelectedArraysOverTime.h | 2 + .../Parallel/vtkPHyperTreeGridProbeFilter.cxx | 2 + .../Parallel/vtkPHyperTreeGridProbeFilter.h | 2 + Filters/Parallel/vtkPKdTree.cxx | 2 + Filters/Parallel/vtkPKdTree.h | 2 + .../Parallel/vtkPLinearExtrusionFilter.cxx | 2 + Filters/Parallel/vtkPLinearExtrusionFilter.h | 2 + Filters/Parallel/vtkPMaskPoints.cxx | 2 + Filters/Parallel/vtkPMaskPoints.h | 2 + Filters/Parallel/vtkPMergeArrays.cxx | 2 + Filters/Parallel/vtkPMergeArrays.h | 2 + Filters/Parallel/vtkPOutlineCornerFilter.cxx | 2 + Filters/Parallel/vtkPOutlineCornerFilter.h | 2 + Filters/Parallel/vtkPOutlineFilter.cxx | 2 + Filters/Parallel/vtkPOutlineFilter.h | 2 + .../Parallel/vtkPOutlineFilterInternals.cxx | 2 + Filters/Parallel/vtkPOutlineFilterInternals.h | 2 + Filters/Parallel/vtkPPolyDataNormals.cxx | 2 + Filters/Parallel/vtkPPolyDataNormals.h | 2 + Filters/Parallel/vtkPProbeFilter.cxx | 4 + Filters/Parallel/vtkPProbeFilter.h | 2 + Filters/Parallel/vtkPProjectSphereFilter.cxx | 2 + Filters/Parallel/vtkPProjectSphereFilter.h | 2 + Filters/Parallel/vtkPReflectionFilter.cxx | 2 + Filters/Parallel/vtkPReflectionFilter.h | 2 + Filters/Parallel/vtkPResampleFilter.cxx | 2 + Filters/Parallel/vtkPResampleFilter.h | 2 + Filters/Parallel/vtkPSphereSource.cxx | 2 + Filters/Parallel/vtkPSphereSource.h | 2 + Filters/Parallel/vtkPTextureMapToSphere.cxx | 2 + Filters/Parallel/vtkPTextureMapToSphere.h | 2 + .../Parallel/vtkPYoungsMaterialInterface.cxx | 2 + .../Parallel/vtkPYoungsMaterialInterface.h | 2 + Filters/Parallel/vtkPartitionBalancer.cxx | 2 + Filters/Parallel/vtkPartitionBalancer.h | 2 + Filters/Parallel/vtkPeriodicFilter.cxx | 2 + Filters/Parallel/vtkPeriodicFilter.h | 2 + Filters/Parallel/vtkPieceRequestFilter.cxx | 2 + Filters/Parallel/vtkPieceRequestFilter.h | 2 + Filters/Parallel/vtkPieceScalars.cxx | 2 + Filters/Parallel/vtkPieceScalars.h | 2 + Filters/Parallel/vtkPipelineSize.cxx | 2 + Filters/Parallel/vtkPipelineSize.h | 2 + Filters/Parallel/vtkProcessIdScalars.cxx | 2 + Filters/Parallel/vtkProcessIdScalars.h | 2 + .../vtkRectilinearGridOutlineFilter.cxx | 2 + .../vtkRectilinearGridOutlineFilter.h | 2 + Filters/Parallel/vtkRemoveGhosts.cxx | 2 + Filters/Parallel/vtkRemoveGhosts.h | 2 + Filters/Parallel/vtkTransmitPolyDataPiece.cxx | 2 + Filters/Parallel/vtkTransmitPolyDataPiece.h | 2 + .../vtkTransmitRectilinearGridPiece.cxx | 2 + .../vtkTransmitRectilinearGridPiece.h | 2 + .../vtkTransmitStructuredDataPiece.cxx | 2 + .../Parallel/vtkTransmitStructuredDataPiece.h | 2 + .../vtkTransmitStructuredGridPiece.cxx | 2 + .../Parallel/vtkTransmitStructuredGridPiece.h | 2 + .../vtkTransmitUnstructuredGridPiece.cxx | 2 + .../vtkTransmitUnstructuredGridPiece.h | 2 + .../vtkAdaptiveResampleToImage.cxx | 4 + .../ParallelDIY2/vtkAdaptiveResampleToImage.h | 2 + .../vtkDIYAggregateDataSetFilter.cxx | 2 + .../vtkDIYAggregateDataSetFilter.h | 2 + .../ParallelDIY2/vtkDIYKdTreeUtilities.cxx | 2 + Filters/ParallelDIY2/vtkDIYKdTreeUtilities.h | 2 + .../ParallelDIY2/vtkExtractSubsetWithSeed.cxx | 2 + .../ParallelDIY2/vtkExtractSubsetWithSeed.h | 2 + Filters/ParallelDIY2/vtkGenerateGlobalIds.cxx | 5 + Filters/ParallelDIY2/vtkGenerateGlobalIds.h | 2 + .../ParallelDIY2/vtkGhostCellsGenerator.cxx | 2 + Filters/ParallelDIY2/vtkGhostCellsGenerator.h | 2 + .../vtkOverlappingCellsDetector.cxx | 2 + .../vtkOverlappingCellsDetector.h | 2 + Filters/ParallelDIY2/vtkPResampleToImage.cxx | 4 + Filters/ParallelDIY2/vtkPResampleToImage.h | 2 + .../ParallelDIY2/vtkPResampleWithDataSet.cxx | 5 + .../ParallelDIY2/vtkPResampleWithDataSet.h | 2 + Filters/ParallelDIY2/vtkProbeLineFilter.cxx | 2 + Filters/ParallelDIY2/vtkProbeLineFilter.h | 2 + .../vtkRedistributeDataSetFilter.cxx | 4 + .../vtkRedistributeDataSetFilter.h | 2 + .../vtkPLagrangianParticleTracker.cxx | 2 + .../vtkPLagrangianParticleTracker.h | 2 + .../vtkPParticlePathFilter.cxx | 2 + .../vtkPParticlePathFilter.h | 2 + .../ParallelFlowPaths/vtkPParticleTracer.cxx | 2 + .../ParallelFlowPaths/vtkPParticleTracer.h | 2 + .../vtkPParticleTracerBase.cxx | 2 + .../vtkPParticleTracerBase.h | 2 + .../vtkPStreaklineFilter.cxx | 2 + .../ParallelFlowPaths/vtkPStreaklineFilter.h | 2 + .../ParallelFlowPaths/vtkPStreamTracer.cxx | 2 + Filters/ParallelFlowPaths/vtkPStreamTracer.h | 4 + .../vtkPConnectivityFilter.cxx | 2 + .../ParallelGeometry/vtkPConnectivityFilter.h | 2 + .../vtkPDistributedDataFilter.cxx | 45 +- .../vtkPDistributedDataFilter.h | 2 + .../vtkPStructuredGridConnectivity.cxx | 2 + .../vtkPStructuredGridConnectivity.h | 2 + Filters/ParallelImaging/vtkExtractPiece.cxx | 2 + Filters/ParallelImaging/vtkExtractPiece.h | 2 + .../vtkMemoryLimitImageDataStreamer.cxx | 2 + .../vtkMemoryLimitImageDataStreamer.h | 2 + .../vtkPComputeHistogram2DOutliers.cxx | 2 + .../vtkPComputeHistogram2DOutliers.h | 2 + .../vtkPExtractHistogram2D.cxx | 2 + .../ParallelImaging/vtkPExtractHistogram2D.h | 2 + .../vtkPPairwiseExtractHistogram2D.cxx | 2 + .../vtkPPairwiseExtractHistogram2D.h | 2 + .../vtkTransmitImageDataPiece.cxx | 2 + .../vtkTransmitImageDataPiece.h | 2 + .../vtkDistributedPointCloudFilter.cxx | 2 + .../vtkDistributedPointCloudFilter.h | 2 + Filters/ParallelMPI/vtkPExtractGrid.cxx | 2 + Filters/ParallelMPI/vtkPExtractGrid.h | 2 + .../vtkPExtractRectilinearGrid.cxx | 2 + .../ParallelMPI/vtkPExtractRectilinearGrid.h | 2 + Filters/ParallelMPI/vtkPExtractVOI.cxx | 2 + Filters/ParallelMPI/vtkPExtractVOI.h | 2 + .../vtkStructuredImplicitConnectivity.cxx | 4 + .../vtkStructuredImplicitConnectivity.h | 6 + .../vtkPAutoCorrelativeStatistics.cxx | 2 + .../vtkPAutoCorrelativeStatistics.h | 2 + .../vtkPBivariateLinearTableThreshold.cxx | 2 + .../vtkPBivariateLinearTableThreshold.h | 2 + .../vtkPComputeQuantiles.cxx | 2 + .../ParallelStatistics/vtkPComputeQuantiles.h | 2 + .../vtkPComputeQuartiles.cxx | 2 + .../ParallelStatistics/vtkPComputeQuartiles.h | 2 + .../vtkPContingencyStatistics.cxx | 2 + .../vtkPContingencyStatistics.h | 2 + .../vtkPCorrelativeStatistics.cxx | 2 + .../vtkPCorrelativeStatistics.h | 2 + .../vtkPDescriptiveStatistics.cxx | 2 + .../vtkPDescriptiveStatistics.h | 2 + .../vtkPKMeansStatistics.cxx | 2 + .../ParallelStatistics/vtkPKMeansStatistics.h | 2 + .../vtkPMultiCorrelativeStatistics.cxx | 2 + .../vtkPMultiCorrelativeStatistics.h | 2 + .../vtkPOrderStatistics.cxx | 2 + .../ParallelStatistics/vtkPOrderStatistics.h | 2 + .../ParallelStatistics/vtkPPCAStatistics.cxx | 2 + .../ParallelStatistics/vtkPPCAStatistics.h | 2 + .../ParallelVerdict/vtkPCellSizeFilter.cxx | 2 + Filters/ParallelVerdict/vtkPCellSizeFilter.h | 2 + Filters/Points/vtkBoundedPointSource.cxx | 2 + Filters/Points/vtkBoundedPointSource.h | 2 + Filters/Points/vtkConnectedPointsFilter.cxx | 2 + Filters/Points/vtkConnectedPointsFilter.h | 2 + Filters/Points/vtkConvertToPointCloud.cxx | 2 + Filters/Points/vtkConvertToPointCloud.h | 2 + Filters/Points/vtkDensifyPointCloudFilter.cxx | 2 + Filters/Points/vtkDensifyPointCloudFilter.h | 2 + .../Points/vtkEllipsoidalGaussianKernel.cxx | 2 + Filters/Points/vtkEllipsoidalGaussianKernel.h | 2 + .../Points/vtkEuclideanClusterExtraction.cxx | 2 + .../Points/vtkEuclideanClusterExtraction.h | 2 + Filters/Points/vtkExtractEnclosedPoints.cxx | 2 + Filters/Points/vtkExtractEnclosedPoints.h | 2 + Filters/Points/vtkExtractHierarchicalBins.cxx | 2 + Filters/Points/vtkExtractHierarchicalBins.h | 2 + Filters/Points/vtkExtractPointCloudPiece.cxx | 2 + Filters/Points/vtkExtractPointCloudPiece.h | 2 + Filters/Points/vtkExtractPoints.cxx | 2 + Filters/Points/vtkExtractPoints.h | 2 + Filters/Points/vtkExtractSurface.cxx | 2 + Filters/Points/vtkExtractSurface.h | 2 + Filters/Points/vtkFitImplicitFunction.cxx | 2 + Filters/Points/vtkFitImplicitFunction.h | 2 + Filters/Points/vtkGaussianKernel.cxx | 2 + Filters/Points/vtkGaussianKernel.h | 2 + Filters/Points/vtkGeneralizedKernel.cxx | 2 + Filters/Points/vtkGeneralizedKernel.h | 2 + .../Points/vtkHierarchicalBinningFilter.cxx | 2 + Filters/Points/vtkHierarchicalBinningFilter.h | 2 + Filters/Points/vtkInterpolationKernel.cxx | 2 + Filters/Points/vtkInterpolationKernel.h | 2 + Filters/Points/vtkLinearKernel.cxx | 2 + Filters/Points/vtkLinearKernel.h | 2 + Filters/Points/vtkMaskPointsFilter.cxx | 2 + Filters/Points/vtkMaskPointsFilter.h | 2 + Filters/Points/vtkPCACurvatureEstimation.cxx | 2 + Filters/Points/vtkPCACurvatureEstimation.h | 2 + Filters/Points/vtkPCANormalEstimation.cxx | 2 + Filters/Points/vtkPCANormalEstimation.h | 2 + Filters/Points/vtkPointCloudFilter.cxx | 2 + Filters/Points/vtkPointCloudFilter.h | 2 + Filters/Points/vtkPointDensityFilter.cxx | 2 + Filters/Points/vtkPointDensityFilter.h | 2 + Filters/Points/vtkPointInterpolator.cxx | 2 + Filters/Points/vtkPointInterpolator.h | 2 + Filters/Points/vtkPointInterpolator2D.cxx | 2 + Filters/Points/vtkPointInterpolator2D.h | 2 + Filters/Points/vtkPointOccupancyFilter.cxx | 2 + Filters/Points/vtkPointOccupancyFilter.h | 2 + Filters/Points/vtkPointSmoothingFilter.cxx | 2 + Filters/Points/vtkPointSmoothingFilter.h | 2 + Filters/Points/vtkPoissonDiskSampler.cxx | 2 + Filters/Points/vtkPoissonDiskSampler.h | 2 + .../Points/vtkProbabilisticVoronoiKernel.cxx | 2 + .../Points/vtkProbabilisticVoronoiKernel.h | 2 + Filters/Points/vtkProjectPointsToPlane.cxx | 2 + Filters/Points/vtkProjectPointsToPlane.h | 2 + Filters/Points/vtkRadiusOutlierRemoval.cxx | 2 + Filters/Points/vtkRadiusOutlierRemoval.h | 2 + Filters/Points/vtkSPHCubicKernel.cxx | 2 + Filters/Points/vtkSPHCubicKernel.h | 2 + Filters/Points/vtkSPHInterpolator.cxx | 2 + Filters/Points/vtkSPHInterpolator.h | 2 + Filters/Points/vtkSPHKernel.cxx | 2 + Filters/Points/vtkSPHKernel.h | 2 + Filters/Points/vtkSPHQuarticKernel.cxx | 2 + Filters/Points/vtkSPHQuarticKernel.h | 2 + Filters/Points/vtkSPHQuinticKernel.cxx | 2 + Filters/Points/vtkSPHQuinticKernel.h | 2 + Filters/Points/vtkShepardKernel.cxx | 2 + Filters/Points/vtkShepardKernel.h | 2 + Filters/Points/vtkSignedDistance.cxx | 2 + Filters/Points/vtkSignedDistance.h | 2 + .../Points/vtkStatisticalOutlierRemoval.cxx | 2 + Filters/Points/vtkStatisticalOutlierRemoval.h | 2 + Filters/Points/vtkUnsignedDistance.cxx | 2 + Filters/Points/vtkUnsignedDistance.h | 2 + Filters/Points/vtkVoronoiKernel.cxx | 2 + Filters/Points/vtkVoronoiKernel.h | 2 + Filters/Points/vtkVoxelGrid.cxx | 2 + Filters/Points/vtkVoxelGrid.h | 2 + Filters/Points/vtkWendlandQuinticKernel.cxx | 2 + Filters/Points/vtkWendlandQuinticKernel.h | 2 + .../vtkProgrammableAttributeDataFilter.cxx | 2 + .../vtkProgrammableAttributeDataFilter.h | 2 + .../Programmable/vtkProgrammableFilter.cxx | 9 +- Filters/Programmable/vtkProgrammableFilter.h | 2 + .../vtkProgrammableGlyphFilter.cxx | 2 + .../Programmable/vtkProgrammableGlyphFilter.h | 2 + Filters/Python/vtkPythonAlgorithm.cxx | 2 + Filters/Python/vtkPythonAlgorithm.h | 2 + .../vtkReebGraphSimplificationFilter.cxx | 2 + .../vtkReebGraphSimplificationFilter.h | 2 + .../vtkReebGraphSurfaceSkeletonFilter.cxx | 2 + .../vtkReebGraphSurfaceSkeletonFilter.h | 2 + .../vtkReebGraphToJoinSplitTreeFilter.cxx | 2 + .../vtkReebGraphToJoinSplitTreeFilter.h | 2 + .../vtkReebGraphVolumeSkeletonFilter.cxx | 2 + .../vtkReebGraphVolumeSkeletonFilter.h | 2 + .../vtkUnstructuredGridToReebGraphFilter.cxx | 2 + .../vtkUnstructuredGridToReebGraphFilter.h | 2 + Filters/SMP/vtkSMPContourGrid.cxx | 2 + Filters/SMP/vtkSMPContourGrid.h | 2 + Filters/SMP/vtkSMPMergePoints.cxx | 2 + Filters/SMP/vtkSMPMergePoints.h | 2 + Filters/SMP/vtkSMPMergePolyDataHelper.cxx | 2 + Filters/SMP/vtkSMPMergePolyDataHelper.h | 2 + Filters/Selection/vtkCellDistanceSelector.cxx | 2 + Filters/Selection/vtkCellDistanceSelector.h | 2 + Filters/Selection/vtkKdTreeSelector.cxx | 2 + Filters/Selection/vtkKdTreeSelector.h | 2 + Filters/Selection/vtkLinearSelector.cxx | 2 + Filters/Selection/vtkLinearSelector.h | 2 + Filters/Sources/vtkArcSource.cxx | 2 + Filters/Sources/vtkArcSource.h | 2 + Filters/Sources/vtkArrowSource.cxx | 2 + Filters/Sources/vtkArrowSource.h | 2 + Filters/Sources/vtkButtonSource.cxx | 2 + Filters/Sources/vtkButtonSource.h | 2 + Filters/Sources/vtkCapsuleSource.cxx | 2 + Filters/Sources/vtkCapsuleSource.h | 2 + Filters/Sources/vtkCellTypeSource.cxx | 2 + Filters/Sources/vtkCellTypeSource.h | 2 + Filters/Sources/vtkConeSource.cxx | 2 + Filters/Sources/vtkConeSource.h | 2 + Filters/Sources/vtkCubeSource.cxx | 2 + Filters/Sources/vtkCubeSource.h | 2 + Filters/Sources/vtkCylinderSource.cxx | 2 + Filters/Sources/vtkCylinderSource.h | 2 + Filters/Sources/vtkDiagonalMatrixSource.cxx | 2 + Filters/Sources/vtkDiagonalMatrixSource.h | 2 + Filters/Sources/vtkDiskSource.cxx | 2 + Filters/Sources/vtkDiskSource.h | 2 + Filters/Sources/vtkEllipseArcSource.cxx | 2 + Filters/Sources/vtkEllipseArcSource.h | 2 + Filters/Sources/vtkEllipticalButtonSource.cxx | 2 + Filters/Sources/vtkEllipticalButtonSource.h | 2 + Filters/Sources/vtkFrustumSource.cxx | 2 + Filters/Sources/vtkFrustumSource.h | 2 + Filters/Sources/vtkGlyphSource2D.cxx | 2 + Filters/Sources/vtkGlyphSource2D.h | 2 + Filters/Sources/vtkGraphToPolyData.cxx | 2 + Filters/Sources/vtkGraphToPolyData.h | 2 + Filters/Sources/vtkHandleSource.cxx | 2 + Filters/Sources/vtkHandleSource.h | 2 + .../vtkHyperTreeGridPreConfiguredSource.cxx | 2 + .../vtkHyperTreeGridPreConfiguredSource.h | 2 + Filters/Sources/vtkHyperTreeGridSource.cxx | 2 + Filters/Sources/vtkHyperTreeGridSource.h | 2 + Filters/Sources/vtkLineSource.cxx | 2 + Filters/Sources/vtkLineSource.h | 2 + Filters/Sources/vtkOutlineCornerFilter.cxx | 2 + Filters/Sources/vtkOutlineCornerFilter.h | 2 + Filters/Sources/vtkOutlineCornerSource.cxx | 2 + Filters/Sources/vtkOutlineCornerSource.h | 2 + Filters/Sources/vtkOutlineSource.cxx | 2 + Filters/Sources/vtkOutlineSource.h | 2 + .../Sources/vtkParametricFunctionSource.cxx | 2 + Filters/Sources/vtkParametricFunctionSource.h | 2 + .../vtkPartitionedDataSetCollectionSource.cxx | 2 + .../vtkPartitionedDataSetCollectionSource.h | 2 + .../Sources/vtkPartitionedDataSetSource.cxx | 2 + Filters/Sources/vtkPartitionedDataSetSource.h | 2 + Filters/Sources/vtkPlaneSource.cxx | 2 + Filters/Sources/vtkPlaneSource.h | 2 + Filters/Sources/vtkPlatonicSolidSource.cxx | 4 + Filters/Sources/vtkPlatonicSolidSource.h | 2 + Filters/Sources/vtkPointHandleSource.cxx | 2 + Filters/Sources/vtkPointHandleSource.h | 2 + Filters/Sources/vtkPointSource.cxx | 2 + Filters/Sources/vtkPointSource.h | 2 + Filters/Sources/vtkPolyLineSource.cxx | 2 + Filters/Sources/vtkPolyLineSource.h | 2 + Filters/Sources/vtkPolyPointSource.cxx | 2 + Filters/Sources/vtkPolyPointSource.h | 2 + .../vtkProgrammableDataObjectSource.cxx | 2 + .../Sources/vtkProgrammableDataObjectSource.h | 2 + Filters/Sources/vtkProgrammableSource.cxx | 2 + Filters/Sources/vtkProgrammableSource.h | 2 + .../Sources/vtkRandomHyperTreeGridSource.cxx | 2 + .../Sources/vtkRandomHyperTreeGridSource.h | 2 + .../Sources/vtkRectangularButtonSource.cxx | 2 + Filters/Sources/vtkRectangularButtonSource.h | 2 + Filters/Sources/vtkRegularPolygonSource.cxx | 2 + Filters/Sources/vtkRegularPolygonSource.h | 2 + Filters/Sources/vtkSelectionSource.cxx | 2 + Filters/Sources/vtkSelectionSource.h | 2 + Filters/Sources/vtkSphereSource.cxx | 2 + Filters/Sources/vtkSphereSource.h | 2 + Filters/Sources/vtkSuperquadricSource.cxx | 2 + Filters/Sources/vtkSuperquadricSource.h | 2 + Filters/Sources/vtkTessellatedBoxSource.cxx | 2 + Filters/Sources/vtkTessellatedBoxSource.h | 2 + Filters/Sources/vtkTextSource.cxx | 2 + Filters/Sources/vtkTextSource.h | 2 + Filters/Sources/vtkTexturedSphereSource.cxx | 2 + Filters/Sources/vtkTexturedSphereSource.h | 2 + .../Sources/vtkUniformHyperTreeGridSource.cxx | 2 + .../Sources/vtkUniformHyperTreeGridSource.h | 2 + .../vtkAutoCorrelativeStatistics.cxx | 2 + .../Statistics/vtkAutoCorrelativeStatistics.h | 2 + .../vtkBivariateLinearTableThreshold.cxx | 2 + .../vtkBivariateLinearTableThreshold.h | 2 + Filters/Statistics/vtkComputeQuantiles.cxx | 2 + Filters/Statistics/vtkComputeQuantiles.h | 2 + Filters/Statistics/vtkComputeQuartiles.cxx | 2 + Filters/Statistics/vtkComputeQuartiles.h | 2 + .../Statistics/vtkContingencyStatistics.cxx | 2 + Filters/Statistics/vtkContingencyStatistics.h | 2 + .../Statistics/vtkCorrelativeStatistics.cxx | 2 + Filters/Statistics/vtkCorrelativeStatistics.h | 2 + .../Statistics/vtkDescriptiveStatistics.cxx | 2 + Filters/Statistics/vtkDescriptiveStatistics.h | 2 + .../vtkExtractFunctionalBagPlot.cxx | 2 + .../Statistics/vtkExtractFunctionalBagPlot.h | 2 + Filters/Statistics/vtkExtractHistogram.cxx | 2 + Filters/Statistics/vtkExtractHistogram.h | 2 + .../vtkHighestDensityRegionsStatistics.cxx | 2 + .../vtkHighestDensityRegionsStatistics.h | 2 + Filters/Statistics/vtkKMeansAssessFunctor.h | 2 + .../Statistics/vtkKMeansDistanceFunctor.cxx | 2 + Filters/Statistics/vtkKMeansDistanceFunctor.h | 2 + .../vtkKMeansDistanceFunctorCalculator.cxx | 2 + .../vtkKMeansDistanceFunctorCalculator.h | 2 + Filters/Statistics/vtkKMeansStatistics.cxx | 2 + Filters/Statistics/vtkKMeansStatistics.h | 2 + Filters/Statistics/vtkLengthDistribution.cxx | 2 + Filters/Statistics/vtkLengthDistribution.h | 2 + .../vtkMultiCorrelativeStatistics.cxx | 2 + .../vtkMultiCorrelativeStatistics.h | 2 + ...kMultiCorrelativeStatisticsAssessFunctor.h | 2 + Filters/Statistics/vtkOrderStatistics.cxx | 2 + Filters/Statistics/vtkOrderStatistics.h | 2 + Filters/Statistics/vtkPCAStatistics.cxx | 2 + Filters/Statistics/vtkPCAStatistics.h | 2 + Filters/Statistics/vtkStatisticsAlgorithm.cxx | 2 + Filters/Statistics/vtkStatisticsAlgorithm.h | 2 + .../vtkStatisticsAlgorithmPrivate.h | 2 + Filters/Statistics/vtkStrahlerMetric.cxx | 2 + Filters/Statistics/vtkStrahlerMetric.h | 2 + Filters/Statistics/vtkStreamingStatistics.cxx | 2 + Filters/Statistics/vtkStreamingStatistics.h | 2 + Filters/Texture/vtkImplicitTextureCoords.cxx | 2 + Filters/Texture/vtkImplicitTextureCoords.h | 2 + Filters/Texture/vtkScalarsToTextureFilter.cxx | 2 + Filters/Texture/vtkScalarsToTextureFilter.h | 2 + Filters/Texture/vtkTextureMapToCylinder.cxx | 2 + Filters/Texture/vtkTextureMapToCylinder.h | 2 + Filters/Texture/vtkTextureMapToPlane.cxx | 2 + Filters/Texture/vtkTextureMapToPlane.h | 2 + Filters/Texture/vtkTextureMapToSphere.cxx | 2 + Filters/Texture/vtkTextureMapToSphere.h | 2 + Filters/Texture/vtkThresholdTextureCoords.cxx | 2 + Filters/Texture/vtkThresholdTextureCoords.h | 2 + Filters/Texture/vtkTransformTextureCoords.cxx | 2 + Filters/Texture/vtkTransformTextureCoords.h | 2 + Filters/Texture/vtkTriangularTCoords.cxx | 2 + Filters/Texture/vtkTriangularTCoords.h | 2 + Filters/Topology/vtkFiberSurface.cxx | 2 + Filters/Topology/vtkFiberSurface.h | 2 + Filters/Verdict/vtkCellQuality.cxx | 2 + Filters/Verdict/vtkCellQuality.h | 2 + Filters/Verdict/vtkCellSizeFilter.cxx | 2 + Filters/Verdict/vtkCellSizeFilter.h | 2 + Filters/Verdict/vtkMatrixMathFilter.cxx | 2 + Filters/Verdict/vtkMatrixMathFilter.h | 2 + Filters/Verdict/vtkMeshQuality.cxx | 2 + Filters/Verdict/vtkMeshQuality.h | 2 + GUISupport/MFC/vtkMFCWindow.cxx | 4 + GUISupport/MFC/vtkMFCWindow.h | 2 + GUISupport/Qt/QFilterTreeProxyModel.cxx | 2 + GUISupport/Qt/QFilterTreeProxyModel.h | 2 + GUISupport/Qt/QVTKApplication.cxx | 2 + GUISupport/Qt/QVTKApplication.h | 4 + GUISupport/Qt/QVTKInteractor.cxx | 2 + GUISupport/Qt/QVTKInteractor.h | 2 + GUISupport/Qt/QVTKInteractorAdapter.cxx | 2 + GUISupport/Qt/QVTKInteractorAdapter.h | 5 +- GUISupport/Qt/QVTKInteractorInternal.h | 6 +- GUISupport/Qt/QVTKOpenGLNativeWidget.cxx | 2 + GUISupport/Qt/QVTKOpenGLNativeWidget.h | 2 + GUISupport/Qt/QVTKOpenGLStereoWidget.cxx | 2 + GUISupport/Qt/QVTKOpenGLStereoWidget.h | 2 + GUISupport/Qt/QVTKOpenGLWindow.cxx | 2 + GUISupport/Qt/QVTKOpenGLWindow.h | 2 + GUISupport/Qt/QVTKRenderWindowAdapter.cxx | 2 + GUISupport/Qt/QVTKRenderWindowAdapter.h | 3 + GUISupport/Qt/QVTKTableModelAdapter.cxx | 2 + GUISupport/Qt/QVTKTableModelAdapter.h | 2 + GUISupport/Qt/Testing/Cxx/TestQtCommon.cxx | 2 + GUISupport/Qt/Testing/Cxx/TestQtCommon.h | 2 + GUISupport/Qt/vtkEventQtSlotConnect.cxx | 2 + GUISupport/Qt/vtkEventQtSlotConnect.h | 3 + GUISupport/Qt/vtkQWidgetRepresentation.cxx | 2 + GUISupport/Qt/vtkQWidgetRepresentation.h | 3 + GUISupport/Qt/vtkQWidgetTexture.cxx | 2 + GUISupport/Qt/vtkQWidgetTexture.h | 3 + GUISupport/Qt/vtkQWidgetWidget.cxx | 2 + GUISupport/Qt/vtkQWidgetWidget.h | 3 + GUISupport/Qt/vtkQtAbstractModelAdapter.cxx | 2 + GUISupport/Qt/vtkQtAbstractModelAdapter.h | 2 + .../Qt/vtkQtAnnotationLayersModelAdapter.cxx | 2 + .../Qt/vtkQtAnnotationLayersModelAdapter.h | 2 + GUISupport/Qt/vtkQtConnection.cxx | 2 + GUISupport/Qt/vtkQtConnection.h | 2 + GUISupport/Qt/vtkQtDebugLeaksModel.cxx | 8 +- GUISupport/Qt/vtkQtDebugLeaksModel.h | 2 + GUISupport/Qt/vtkQtDebugLeaksView.cxx | 8 +- GUISupport/Qt/vtkQtDebugLeaksView.h | 3 + GUISupport/Qt/vtkQtTableModelAdapter.cxx | 2 + GUISupport/Qt/vtkQtTableModelAdapter.h | 6 +- GUISupport/Qt/vtkQtTreeModelAdapter.cxx | 2 + GUISupport/Qt/vtkQtTreeModelAdapter.h | 6 +- GUISupport/Qt/vtkTDxQtUnixDevices.cxx | 2 + GUISupport/Qt/vtkTDxQtUnixDevices.h | 2 + .../QtQuick/QQuickVTKInteractiveWidget.cxx | 2 + .../QtQuick/QQuickVTKInteractiveWidget.h | 2 + .../QtQuick/QQuickVTKInteractorAdapter.cxx | 2 + .../QtQuick/QQuickVTKInteractorAdapter.h | 6 +- GUISupport/QtQuick/QQuickVTKRenderItem.cxx | 2 + GUISupport/QtQuick/QQuickVTKRenderItem.h | 6 +- GUISupport/QtQuick/QQuickVTKRenderWindow.cxx | 2 + GUISupport/QtQuick/QQuickVTKRenderWindow.h | 9 +- GUISupport/QtQuick/qml/QQmlVTKPlugin.cxx | 2 + GUISupport/QtQuick/qml/QQmlVTKPlugin.h | 4 + GUISupport/QtSQL/vtkQtSQLDatabase.cxx | 2 + GUISupport/QtSQL/vtkQtSQLDatabase.h | 2 + GUISupport/QtSQL/vtkQtSQLQuery.cxx | 2 + GUISupport/QtSQL/vtkQtSQLQuery.h | 2 + GUISupport/QtSQL/vtkQtTimePointUtility.cxx | 2 + GUISupport/QtSQL/vtkQtTimePointUtility.h | 2 + Geovis/Core/vtkCompassWidget.cxx | 371 +++++++++++++ Geovis/Core/vtkGeoProjection.cxx | 2 + Geovis/Core/vtkGeoProjection.h | 3 + Geovis/Core/vtkGeoTransform.cxx | 2 + Geovis/Core/vtkGeoTransform.h | 2 + Geovis/GDAL/vtkGDALRasterConverter.cxx | 2 + Geovis/GDAL/vtkGDALRasterConverter.h | 6 +- Geovis/GDAL/vtkGDALRasterReprojection.cxx | 2 + Geovis/GDAL/vtkGDALRasterReprojection.h | 3 + Geovis/GDAL/vtkRasterReprojectionFilter.cxx | 2 + Geovis/GDAL/vtkRasterReprojectionFilter.h | 2 + .../Core/vtkADIOS2CoreArraySelection.cxx | 2 + IO/ADIOS2/Core/vtkADIOS2CoreArraySelection.h | 2 + IO/ADIOS2/Core/vtkADIOS2CoreTypeTraits.h | 2 + IO/ADIOS2/VTX/VTXSchemaManager.cxx | 4 +- IO/ADIOS2/VTX/VTXSchemaManager.h | 2 + IO/ADIOS2/VTX/common/VTXDataArray.cxx | 2 + IO/ADIOS2/VTX/common/VTXDataArray.h | 2 + IO/ADIOS2/VTX/common/VTXHelper.cxx | 2 + IO/ADIOS2/VTX/common/VTXHelper.h | 2 + IO/ADIOS2/VTX/common/VTXHelper.inl | 2 + IO/ADIOS2/VTX/common/VTXHelper.txx | 2 + IO/ADIOS2/VTX/common/VTXTypes.h | 2 + IO/ADIOS2/VTX/schema/VTXSchema.cxx | 2 + IO/ADIOS2/VTX/schema/VTXSchema.h | 2 + IO/ADIOS2/VTX/schema/VTXSchema.txx | 2 + IO/ADIOS2/VTX/schema/vtk/VTXvtkBase.cxx | 2 + IO/ADIOS2/VTX/schema/vtk/VTXvtkBase.h | 2 + IO/ADIOS2/VTX/schema/vtk/VTXvtkVTI.cxx | 2 + IO/ADIOS2/VTX/schema/vtk/VTXvtkVTI.h | 2 + IO/ADIOS2/VTX/schema/vtk/VTXvtkVTI.txx | 2 + IO/ADIOS2/VTX/schema/vtk/VTXvtkVTU.cxx | 2 + IO/ADIOS2/VTX/schema/vtk/VTXvtkVTU.h | 2 + IO/ADIOS2/VTX/schema/vtk/VTXvtkVTU.txx | 2 + IO/ADIOS2/vtkADIOS2CoreImageReader.cxx | 4 + IO/ADIOS2/vtkADIOS2CoreImageReader.h | 2 + IO/ADIOS2/vtkADIOS2VTXReader.cxx | 2 + IO/ADIOS2/vtkADIOS2VTXReader.h | 5 + IO/AMR/vtkAMRBaseParticlesReader.cxx | 2 + IO/AMR/vtkAMRBaseParticlesReader.h | 2 + IO/AMR/vtkAMRBaseReader.cxx | 2 + IO/AMR/vtkAMRBaseReader.h | 2 + IO/AMR/vtkAMRDataSetCache.cxx | 2 + IO/AMR/vtkAMRDataSetCache.h | 2 + IO/AMR/vtkAMREnzoParticlesReader.cxx | 2 + IO/AMR/vtkAMREnzoParticlesReader.h | 2 + IO/AMR/vtkAMREnzoReader.cxx | 4 + IO/AMR/vtkAMREnzoReader.h | 2 + IO/AMR/vtkAMREnzoReaderInternal.cxx | 2 + IO/AMR/vtkAMREnzoReaderInternal.h | 4 + IO/AMR/vtkAMRFlashParticlesReader.cxx | 2 + IO/AMR/vtkAMRFlashParticlesReader.h | 2 + IO/AMR/vtkAMRFlashReader.cxx | 2 + IO/AMR/vtkAMRFlashReader.h | 2 + IO/AMR/vtkAMRFlashReaderInternal.cxx | 2 + IO/AMR/vtkAMRFlashReaderInternal.h | 2 + IO/AMR/vtkAMRVelodyneReader.cxx | 2 + IO/AMR/vtkAMRVelodyneReader.h | 2 + IO/AMR/vtkAMRVelodyneReaderInternal.cxx | 2 + IO/AMR/vtkAMRVelodyneReaderInternal.h | 3 + IO/AMR/vtkAMReXGridReader.cxx | 2 + IO/AMR/vtkAMReXGridReader.h | 2 + IO/AMR/vtkAMReXGridReaderInternal.cxx | 2 + IO/AMR/vtkAMReXGridReaderInternal.h | 2 + IO/AMR/vtkAMReXParticlesReader.cxx | 2 + IO/AMR/vtkAMReXParticlesReader.h | 2 + IO/Asynchronous/vtkThreadedImageWriter.cxx | 2 + IO/Asynchronous/vtkThreadedImageWriter.h | 2 + IO/CGNS/cgio_helpers.cxx | 2 + IO/CGNS/cgio_helpers.h | 2 + IO/CGNS/vtkCGNSCache.h | 2 + IO/CGNS/vtkCGNSFileSeriesReader.cxx | 8 + IO/CGNS/vtkCGNSFileSeriesReader.h | 2 + IO/CGNS/vtkCGNSReader.cxx | 2 + IO/CGNS/vtkCGNSReader.h | 10 +- IO/CGNS/vtkCGNSReaderInternal.cxx | 2 + IO/CGNS/vtkCGNSReaderInternal.h | 7 +- IO/CGNS/vtkFileSeriesHelper.cxx | 2 + IO/CGNS/vtkFileSeriesHelper.h | 2 + IO/CONVERGECFD/vtkCONVERGECFDReader.cxx | 2 + IO/CONVERGECFD/vtkCONVERGECFDReader.h | 2 + .../vtkConduitArrayUtilities.cxx | 12 + IO/CatalystConduit/vtkConduitArrayUtilities.h | 2 + IO/CatalystConduit/vtkConduitSource.cxx | 5 + IO/CatalystConduit/vtkConduitSource.h | 2 + IO/CatalystConduit/vtkDataObjectToConduit.cxx | 2 + IO/CatalystConduit/vtkDataObjectToConduit.h | 6 +- IO/Cesium3DTiles/TreeInformation.cxx | 6 +- IO/Cesium3DTiles/TreeInformation.h | 2 + IO/Cesium3DTiles/vtkCesium3DTilesWriter.cxx | 2 + IO/Cesium3DTiles/vtkCesium3DTilesWriter.h | 2 + .../vtkCesiumPointCloudWriter.cxx | 2 + IO/Cesium3DTiles/vtkCesiumPointCloudWriter.h | 3 + IO/Chemistry/vtkCMLMoleculeReader.cxx | 2 + IO/Chemistry/vtkCMLMoleculeReader.h | 2 + IO/Chemistry/vtkGaussianCubeReader.cxx | 2 + IO/Chemistry/vtkGaussianCubeReader.h | 2 + IO/Chemistry/vtkGaussianCubeReader2.cxx | 2 + IO/Chemistry/vtkGaussianCubeReader2.h | 2 + IO/Chemistry/vtkMoleculeReaderBase.cxx | 2 + IO/Chemistry/vtkMoleculeReaderBase.h | 2 + IO/Chemistry/vtkPDBReader.cxx | 2 + IO/Chemistry/vtkPDBReader.h | 2 + IO/Chemistry/vtkVASPAnimationReader.cxx | 2 + IO/Chemistry/vtkVASPAnimationReader.h | 3 + IO/Chemistry/vtkVASPTessellationReader.cxx | 5 + IO/Chemistry/vtkVASPTessellationReader.h | 3 + IO/Chemistry/vtkXYZMolReader.cxx | 2 + IO/Chemistry/vtkXYZMolReader.h | 2 + IO/Chemistry/vtkXYZMolReader2.cxx | 2 + IO/Chemistry/vtkXYZMolReader2.h | 2 + IO/CityGML/vtkCityGMLReader.cxx | 2 + IO/CityGML/vtkCityGMLReader.h | 2 + IO/Core/vtkASCIITextCodec.cxx | 2 + IO/Core/vtkASCIITextCodec.h | 2 + IO/Core/vtkAbstractParticleWriter.cxx | 2 + IO/Core/vtkAbstractParticleWriter.h | 2 + IO/Core/vtkAbstractPolyDataReader.cxx | 2 + IO/Core/vtkAbstractPolyDataReader.h | 2 + IO/Core/vtkArrayDataReader.cxx | 2 + IO/Core/vtkArrayDataReader.h | 2 + IO/Core/vtkArrayDataWriter.cxx | 2 + IO/Core/vtkArrayDataWriter.h | 2 + IO/Core/vtkArrayReader.cxx | 2 + IO/Core/vtkArrayReader.h | 2 + IO/Core/vtkArrayWriter.cxx | 2 + IO/Core/vtkArrayWriter.h | 2 + IO/Core/vtkBase64InputStream.cxx | 2 + IO/Core/vtkBase64InputStream.h | 2 + IO/Core/vtkBase64OutputStream.cxx | 2 + IO/Core/vtkBase64OutputStream.h | 2 + IO/Core/vtkBase64Utilities.cxx | 2 + IO/Core/vtkBase64Utilities.h | 2 + IO/Core/vtkDataCompressor.cxx | 2 + IO/Core/vtkDataCompressor.h | 2 + IO/Core/vtkDelimitedTextWriter.cxx | 2 + IO/Core/vtkDelimitedTextWriter.h | 2 + IO/Core/vtkGlobFileNames.cxx | 2 + IO/Core/vtkGlobFileNames.h | 2 + IO/Core/vtkInputStream.cxx | 2 + IO/Core/vtkInputStream.h | 2 + IO/Core/vtkJavaScriptDataWriter.cxx | 2 + IO/Core/vtkJavaScriptDataWriter.h | 2 + IO/Core/vtkLZ4DataCompressor.cxx | 2 + IO/Core/vtkLZ4DataCompressor.h | 2 + IO/Core/vtkLZMADataCompressor.cxx | 2 + IO/Core/vtkLZMADataCompressor.h | 2 + IO/Core/vtkNumberToString.cxx | 2 + IO/Core/vtkNumberToString.h | 2 + IO/Core/vtkOutputStream.cxx | 2 + IO/Core/vtkOutputStream.h | 2 + IO/Core/vtkSortFileNames.cxx | 2 + IO/Core/vtkSortFileNames.h | 2 + IO/Core/vtkTextCodec.cxx | 2 + IO/Core/vtkTextCodec.h | 2 + IO/Core/vtkTextCodecFactory.cxx | 2 + IO/Core/vtkTextCodecFactory.h | 2 + IO/Core/vtkUTF16TextCodec.cxx | 2 + IO/Core/vtkUTF16TextCodec.h | 2 + IO/Core/vtkUTF8TextCodec.cxx | 2 + IO/Core/vtkUTF8TextCodec.h | 2 + IO/Core/vtkUpdateCellsV8toV9.h | 2 + IO/Core/vtkWriter.cxx | 2 + IO/Core/vtkWriter.h | 2 + IO/Core/vtkZLibDataCompressor.cxx | 2 + IO/Core/vtkZLibDataCompressor.h | 2 + IO/EnSight/vtkEnSight6BinaryReader.cxx | 2 + IO/EnSight/vtkEnSight6BinaryReader.h | 2 + IO/EnSight/vtkEnSight6Reader.cxx | 2 + IO/EnSight/vtkEnSight6Reader.h | 2 + IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 2 + IO/EnSight/vtkEnSightGoldBinaryReader.h | 2 + IO/EnSight/vtkEnSightGoldReader.cxx | 2 + IO/EnSight/vtkEnSightGoldReader.h | 2 + IO/EnSight/vtkEnSightMasterServerReader.cxx | 2 + IO/EnSight/vtkEnSightMasterServerReader.h | 2 + IO/EnSight/vtkEnSightReader.cxx | 2 + IO/EnSight/vtkEnSightReader.h | 2 + IO/EnSight/vtkGenericEnSightReader.cxx | 2 + IO/EnSight/vtkGenericEnSightReader.h | 2 + IO/Exodus/vtkCPExodusIIElementBlock.cxx | 2 + IO/Exodus/vtkCPExodusIIElementBlock.h | 2 + .../vtkCPExodusIIElementBlockCellIterator.cxx | 2 + .../vtkCPExodusIIElementBlockCellIterator.h | 2 + IO/Exodus/vtkCPExodusIIInSituReader.cxx | 2 + IO/Exodus/vtkCPExodusIIInSituReader.h | 2 + .../vtkCPExodusIINodalCoordinatesTemplate.h | 2 + .../vtkCPExodusIINodalCoordinatesTemplate.txx | 2 + IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h | 2 + .../vtkCPExodusIIResultsArrayTemplate.txx | 2 + IO/Exodus/vtkExodusIICache.cxx | 4 + IO/Exodus/vtkExodusIICache.h | 2 + IO/Exodus/vtkExodusIIReader.cxx | 4 + IO/Exodus/vtkExodusIIReader.h | 2 + IO/Exodus/vtkExodusIIReaderParser.cxx | 2 + IO/Exodus/vtkExodusIIReaderParser.h | 2 + IO/Exodus/vtkExodusIIReaderPrivate.h | 2 + IO/Exodus/vtkExodusIIReaderVariableCheck.cxx | 2 + IO/Exodus/vtkExodusIIReaderVariableCheck.h | 2 + IO/Exodus/vtkExodusIIWriter.cxx | 2 + IO/Exodus/vtkExodusIIWriter.h | 2 + IO/Exodus/vtkModelMetadata.cxx | 4 + IO/Exodus/vtkModelMetadata.h | 2 + IO/Export/vtkExporter.cxx | 2 + IO/Export/vtkExporter.h | 2 + IO/Export/vtkGLTFExporter.cxx | 2 + IO/Export/vtkGLTFExporter.h | 2 + IO/Export/vtkIVExporter.cxx | 2 + IO/Export/vtkIVExporter.h | 2 + IO/Export/vtkJSONDataSetWriter.cxx | 2 + IO/Export/vtkJSONDataSetWriter.h | 2 + IO/Export/vtkJSONRenderWindowExporter.cxx | 2 + IO/Export/vtkJSONRenderWindowExporter.h | 2 + IO/Export/vtkJSONSceneExporter.cxx | 2 + IO/Export/vtkJSONSceneExporter.h | 2 + IO/Export/vtkOBJExporter.cxx | 2 + IO/Export/vtkOBJExporter.h | 2 + IO/Export/vtkOOGLExporter.cxx | 2 + IO/Export/vtkOOGLExporter.h | 2 + IO/Export/vtkPOVExporter.cxx | 2 + IO/Export/vtkPOVExporter.h | 2 + IO/Export/vtkRIBExporter.cxx | 2 + IO/Export/vtkRIBExporter.h | 2 + IO/Export/vtkRIBLight.cxx | 2 + IO/Export/vtkRIBLight.h | 2 + IO/Export/vtkRIBProperty.cxx | 2 + IO/Export/vtkRIBProperty.h | 2 + IO/Export/vtkSVGContextDevice2D.cxx | 2 + IO/Export/vtkSVGContextDevice2D.h | 2 + IO/Export/vtkSVGExporter.cxx | 2 + IO/Export/vtkSVGExporter.h | 2 + IO/Export/vtkSingleVTPExporter.cxx | 2 + IO/Export/vtkSingleVTPExporter.h | 2 + IO/Export/vtkVRMLExporter.cxx | 2 + IO/Export/vtkVRMLExporter.h | 2 + IO/Export/vtkX3D.cxx | 2 + IO/Export/vtkX3D.h | 10 +- IO/Export/vtkX3DExporter.cxx | 2 + IO/Export/vtkX3DExporter.h | 2 + IO/Export/vtkX3DExporterFIWriter.cxx | 4 + IO/Export/vtkX3DExporterFIWriter.h | 2 + IO/Export/vtkX3DExporterFIWriterHelper.h | 2 + IO/Export/vtkX3DExporterWriter.cxx | 2 + IO/Export/vtkX3DExporterWriter.h | 2 + IO/Export/vtkX3DExporterXMLWriter.cxx | 2 + IO/Export/vtkX3DExporterXMLWriter.h | 2 + IO/ExportGL2PS/vtkGL2PSExporter.cxx | 2 + IO/ExportGL2PS/vtkGL2PSExporter.h | 2 + IO/ExportGL2PS/vtkOpenGLGL2PSExporter.cxx | 2 + IO/ExportGL2PS/vtkOpenGLGL2PSExporter.h | 2 + IO/ExportPDF/vtkPDFContextDevice2D.cxx | 2 + IO/ExportPDF/vtkPDFContextDevice2D.h | 2 + IO/ExportPDF/vtkPDFExporter.cxx | 2 + IO/ExportPDF/vtkPDFExporter.h | 2 + IO/FFMPEG/vtkFFMPEGVideoSource.cxx | 2 + IO/FFMPEG/vtkFFMPEGVideoSource.h | 2 + IO/FFMPEG/vtkFFMPEGWriter.cxx | 3 + IO/FFMPEG/vtkFFMPEGWriter.h | 2 + IO/Fides/vtkFidesReader.cxx | 2 + IO/Fides/vtkFidesReader.h | 2 + IO/GDAL/vtkGDAL.cxx | 2 + IO/GDAL/vtkGDAL.h | 2 + IO/GDAL/vtkGDALRasterReader.cxx | 2 + IO/GDAL/vtkGDALRasterReader.h | 2 + IO/GDAL/vtkGDALVectorReader.cxx | 2 + IO/GDAL/vtkGDALVectorReader.h | 2 + IO/GeoJSON/vtkGeoJSONFeature.cxx | 2 + IO/GeoJSON/vtkGeoJSONFeature.h | 2 + IO/GeoJSON/vtkGeoJSONReader.cxx | 2 + IO/GeoJSON/vtkGeoJSONReader.h | 2 + IO/GeoJSON/vtkGeoJSONWriter.cxx | 2 + IO/GeoJSON/vtkGeoJSONWriter.h | 2 + IO/Geometry/vtkAVSucdReader.cxx | 2 + IO/Geometry/vtkAVSucdReader.h | 2 + IO/Geometry/vtkBYUReader.cxx | 2 + IO/Geometry/vtkBYUReader.h | 2 + IO/Geometry/vtkBYUWriter.cxx | 2 + IO/Geometry/vtkBYUWriter.h | 2 + IO/Geometry/vtkCGMWriter.cxx | 2 + IO/Geometry/vtkCGMWriter.h | 2 + IO/Geometry/vtkChacoReader.cxx | 2 + IO/Geometry/vtkChacoReader.h | 2 + IO/Geometry/vtkFLUENTReader.cxx | 2 + IO/Geometry/vtkFLUENTReader.h | 2 + IO/Geometry/vtkFacetWriter.cxx | 2 + IO/Geometry/vtkFacetWriter.h | 2 + IO/Geometry/vtkGAMBITReader.cxx | 2 + IO/Geometry/vtkGAMBITReader.h | 2 + IO/Geometry/vtkGLTFDocumentLoader.cxx | 2 + IO/Geometry/vtkGLTFDocumentLoader.h | 2 + .../vtkGLTFDocumentLoaderInternals.cxx | 2 + IO/Geometry/vtkGLTFDocumentLoaderInternals.h | 2 + IO/Geometry/vtkGLTFReader.cxx | 2 + IO/Geometry/vtkGLTFReader.h | 2 + IO/Geometry/vtkGLTFUtils.cxx | 43 +- IO/Geometry/vtkGLTFUtils.h | 4 + IO/Geometry/vtkGLTFWriter.cxx | 4 + IO/Geometry/vtkGLTFWriter.h | 2 + IO/Geometry/vtkGLTFWriterUtils.cxx | 2 + IO/Geometry/vtkGLTFWriterUtils.h | 2 + IO/Geometry/vtkHoudiniPolyDataWriter.cxx | 2 + IO/Geometry/vtkHoudiniPolyDataWriter.h | 2 + IO/Geometry/vtkIVWriter.cxx | 2 + IO/Geometry/vtkIVWriter.h | 2 + IO/Geometry/vtkMCubesReader.cxx | 2 + IO/Geometry/vtkMCubesReader.h | 2 + IO/Geometry/vtkMCubesWriter.cxx | 2 + IO/Geometry/vtkMCubesWriter.h | 2 + IO/Geometry/vtkMFIXReader.cxx | 2 + IO/Geometry/vtkMFIXReader.h | 2 + IO/Geometry/vtkOBJReader.cxx | 2 + IO/Geometry/vtkOBJReader.h | 2 + IO/Geometry/vtkOBJWriter.cxx | 2 + IO/Geometry/vtkOBJWriter.h | 2 + IO/Geometry/vtkOpenFOAMReader.cxx | 4 + IO/Geometry/vtkOpenFOAMReader.h | 2 + IO/Geometry/vtkPTSReader.cxx | 2 + IO/Geometry/vtkPTSReader.h | 2 + IO/Geometry/vtkParticleReader.cxx | 2 + IO/Geometry/vtkParticleReader.h | 2 + IO/Geometry/vtkProStarReader.cxx | 2 + IO/Geometry/vtkProStarReader.h | 2 + IO/Geometry/vtkSTLReader.cxx | 2 + IO/Geometry/vtkSTLReader.h | 2 + IO/Geometry/vtkSTLWriter.cxx | 2 + IO/Geometry/vtkSTLWriter.h | 2 + IO/Geometry/vtkTecplotReader.cxx | 2 + IO/Geometry/vtkTecplotReader.h | 2 + IO/Geometry/vtkWindBladeReader.cxx | 2 + IO/Geometry/vtkWindBladeReader.h | 2 + IO/H5Rage/H5RageAdaptor.cxx | 6 + IO/H5Rage/H5RageAdaptor.h | 2 + IO/H5Rage/vtkH5RageReader.cxx | 2 + IO/H5Rage/vtkH5RageReader.h | 2 + IO/H5part/vtkH5PartReader.cxx | 2 + IO/H5part/vtkH5PartReader.h | 5 +- IO/HDF/vtkHDF5ScopedHandle.h | 2 + IO/HDF/vtkHDFReader.cxx | 2 + IO/HDF/vtkHDFReader.h | 2 + IO/HDF/vtkHDFReaderImplementation.cxx | 2 + IO/HDF/vtkHDFReaderImplementation.h | 2 + IO/HDF/vtkHDFReaderVersion.h | 2 + IO/IOSS/vtkIOSSFilesScanner.cxx | 2 + IO/IOSS/vtkIOSSFilesScanner.h | 2 + IO/IOSS/vtkIOSSModel.cxx | 2 + IO/IOSS/vtkIOSSModel.h | 2 + IO/IOSS/vtkIOSSReader.cxx | 2 + IO/IOSS/vtkIOSSReader.h | 2 + IO/IOSS/vtkIOSSUtilities.cxx | 2 + IO/IOSS/vtkIOSSUtilities.h | 7 +- IO/IOSS/vtkIOSSWriter.cxx | 2 + IO/IOSS/vtkIOSSWriter.h | 2 + IO/Image/vtkBMPReader.cxx | 2 + IO/Image/vtkBMPReader.h | 2 + IO/Image/vtkBMPWriter.cxx | 2 + IO/Image/vtkBMPWriter.h | 2 + IO/Image/vtkDEMReader.cxx | 2 + IO/Image/vtkDEMReader.h | 2 + IO/Image/vtkDICOMImageReader.cxx | 2 + IO/Image/vtkDICOMImageReader.h | 2 + IO/Image/vtkGESignaReader.cxx | 2 + IO/Image/vtkGESignaReader.h | 2 + IO/Image/vtkHDRReader.cxx | 2 + IO/Image/vtkHDRReader.h | 2 + IO/Image/vtkImageExport.cxx | 2 + IO/Image/vtkImageExport.h | 2 + IO/Image/vtkImageImport.cxx | 2 + IO/Image/vtkImageImport.h | 2 + IO/Image/vtkImageImportExecutive.cxx | 2 + IO/Image/vtkImageImportExecutive.h | 2 + IO/Image/vtkImageReader.cxx | 2 + IO/Image/vtkImageReader.h | 2 + IO/Image/vtkImageReader2.cxx | 2 + IO/Image/vtkImageReader2.h | 2 + IO/Image/vtkImageReader2Collection.cxx | 2 + IO/Image/vtkImageReader2Collection.h | 2 + IO/Image/vtkImageReader2Factory.cxx | 2 + IO/Image/vtkImageReader2Factory.h | 2 + IO/Image/vtkImageWriter.cxx | 2 + IO/Image/vtkImageWriter.h | 2 + IO/Image/vtkJPEGReader.cxx | 26 +- IO/Image/vtkJPEGReader.h | 2 + IO/Image/vtkJPEGWriter.cxx | 23 +- IO/Image/vtkJPEGWriter.h | 2 + IO/Image/vtkJSONImageWriter.cxx | 2 + IO/Image/vtkJSONImageWriter.h | 2 + IO/Image/vtkMRCReader.cxx | 2 + IO/Image/vtkMRCReader.h | 2 + IO/Image/vtkMedicalImageProperties.cxx | 2 + IO/Image/vtkMedicalImageProperties.h | 2 + IO/Image/vtkMedicalImageReader2.cxx | 2 + IO/Image/vtkMedicalImageReader2.h | 2 + IO/Image/vtkMetaImageReader.cxx | 2 + IO/Image/vtkMetaImageReader.h | 3 + IO/Image/vtkMetaImageWriter.cxx | 2 + IO/Image/vtkMetaImageWriter.h | 2 + IO/Image/vtkNIFTIImageHeader.cxx | 2 + IO/Image/vtkNIFTIImageHeader.h | 2 + IO/Image/vtkNIFTIImageReader.cxx | 2 + IO/Image/vtkNIFTIImageReader.h | 5 + IO/Image/vtkNIFTIImageWriter.cxx | 2 + IO/Image/vtkNIFTIImageWriter.h | 2 + IO/Image/vtkNrrdReader.cxx | 2 + IO/Image/vtkNrrdReader.h | 2 + IO/Image/vtkOMETIFFReader.cxx | 2 + IO/Image/vtkOMETIFFReader.h | 2 + IO/Image/vtkPNGReader.cxx | 2 + IO/Image/vtkPNGReader.h | 2 + IO/Image/vtkPNGWriter.cxx | 2 + IO/Image/vtkPNGWriter.h | 2 + IO/Image/vtkPNMReader.cxx | 2 + IO/Image/vtkPNMReader.h | 2 + IO/Image/vtkPNMWriter.cxx | 2 + IO/Image/vtkPNMWriter.h | 2 + IO/Image/vtkPostScriptWriter.cxx | 2 + IO/Image/vtkPostScriptWriter.h | 2 + IO/Image/vtkSEPReader.cxx | 5 + IO/Image/vtkSEPReader.h | 4 + IO/Image/vtkSLCReader.cxx | 2 + IO/Image/vtkSLCReader.h | 2 + IO/Image/vtkTGAReader.cxx | 2 + IO/Image/vtkTGAReader.h | 2 + IO/Image/vtkTIFFReader.cxx | 2 + IO/Image/vtkTIFFReader.h | 2 + IO/Image/vtkTIFFReaderInternal.h | 2 + IO/Image/vtkTIFFWriter.cxx | 2 + IO/Image/vtkTIFFWriter.h | 2 + IO/Image/vtkVolume16Reader.cxx | 2 + IO/Image/vtkVolume16Reader.h | 2 + IO/Image/vtkVolumeReader.cxx | 2 + IO/Image/vtkVolumeReader.h | 2 + IO/Import/vtk3DS.h | 4 + IO/Import/vtk3DSImporter.cxx | 211 ++++---- IO/Import/vtk3DSImporter.h | 2 + IO/Import/vtkGLTFImporter.cxx | 2 + IO/Import/vtkGLTFImporter.h | 2 + IO/Import/vtkImporter.cxx | 2 + IO/Import/vtkImporter.h | 2 + IO/Import/vtkOBJImporter.cxx | 2 + IO/Import/vtkOBJImporter.h | 2 + IO/Import/vtkOBJImporterInternals.cxx | 4 + IO/Import/vtkOBJImporterInternals.h | 2 + IO/Import/vtkVRML.h | 2 + IO/Import/vtkVRMLImporter.cxx | 2 + IO/Import/vtkVRMLImporter.h | 2 + IO/Import/vtkVRMLImporter_Yacc.h | 9 + IO/Infovis/vtkBiomTableReader.cxx | 2 + IO/Infovis/vtkBiomTableReader.h | 2 + IO/Infovis/vtkChacoGraphReader.cxx | 2 + IO/Infovis/vtkChacoGraphReader.h | 2 + IO/Infovis/vtkDIMACSGraphReader.cxx | 2 + IO/Infovis/vtkDIMACSGraphReader.h | 2 + IO/Infovis/vtkDIMACSGraphWriter.cxx | 2 + IO/Infovis/vtkDIMACSGraphWriter.h | 2 + IO/Infovis/vtkDelimitedTextReader.cxx | 2 + IO/Infovis/vtkDelimitedTextReader.h | 2 + IO/Infovis/vtkFixedWidthTextReader.cxx | 2 + IO/Infovis/vtkFixedWidthTextReader.h | 2 + IO/Infovis/vtkISIReader.cxx | 2 + IO/Infovis/vtkISIReader.h | 2 + IO/Infovis/vtkMultiNewickTreeReader.cxx | 2 + IO/Infovis/vtkMultiNewickTreeReader.h | 2 + IO/Infovis/vtkNewickTreeReader.cxx | 2 + IO/Infovis/vtkNewickTreeReader.h | 2 + IO/Infovis/vtkNewickTreeWriter.cxx | 2 + IO/Infovis/vtkNewickTreeWriter.h | 2 + IO/Infovis/vtkPhyloXMLTreeReader.cxx | 2 + IO/Infovis/vtkPhyloXMLTreeReader.h | 2 + IO/Infovis/vtkPhyloXMLTreeWriter.cxx | 2 + IO/Infovis/vtkPhyloXMLTreeWriter.h | 2 + IO/Infovis/vtkRISReader.cxx | 2 + IO/Infovis/vtkRISReader.h | 2 + IO/Infovis/vtkTemporalDelimitedTextReader.cxx | 2 + IO/Infovis/vtkTemporalDelimitedTextReader.h | 2 + IO/Infovis/vtkTulipReader.cxx | 2 + IO/Infovis/vtkTulipReader.h | 2 + IO/Infovis/vtkXGMLReader.cxx | 2 + IO/Infovis/vtkXGMLReader.h | 2 + IO/Infovis/vtkXMLTreeReader.cxx | 2 + IO/Infovis/vtkXMLTreeReader.h | 2 + IO/LAS/vtkLASReader.cxx | 2 + IO/LAS/vtkLASReader.h | 3 + IO/LSDyna/LSDynaFamily.cxx | 2 + IO/LSDyna/LSDynaFamily.h | 2 + IO/LSDyna/LSDynaMetaData.cxx | 2 + IO/LSDyna/LSDynaMetaData.h | 2 + IO/LSDyna/vtkLSDynaPart.cxx | 2 + IO/LSDyna/vtkLSDynaPart.h | 2 + IO/LSDyna/vtkLSDynaPartCollection.cxx | 2 + IO/LSDyna/vtkLSDynaPartCollection.h | 2 + IO/LSDyna/vtkLSDynaReader.cxx | 2 + IO/LSDyna/vtkLSDynaReader.h | 2 + IO/LSDyna/vtkLSDynaSummaryParser.cxx | 2 + IO/LSDyna/vtkLSDynaSummaryParser.h | 2 + IO/Legacy/vtkCompositeDataReader.cxx | 2 + IO/Legacy/vtkCompositeDataReader.h | 2 + IO/Legacy/vtkCompositeDataWriter.cxx | 2 + IO/Legacy/vtkCompositeDataWriter.h | 2 + IO/Legacy/vtkDataObjectReader.cxx | 2 + IO/Legacy/vtkDataObjectReader.h | 2 + IO/Legacy/vtkDataObjectWriter.cxx | 2 + IO/Legacy/vtkDataObjectWriter.h | 2 + IO/Legacy/vtkDataReader.cxx | 2 + IO/Legacy/vtkDataReader.h | 2 + IO/Legacy/vtkDataSetReader.cxx | 2 + IO/Legacy/vtkDataSetReader.h | 2 + IO/Legacy/vtkDataSetWriter.cxx | 2 + IO/Legacy/vtkDataSetWriter.h | 2 + IO/Legacy/vtkDataWriter.cxx | 2 + IO/Legacy/vtkDataWriter.h | 2 + IO/Legacy/vtkGenericDataObjectReader.cxx | 2 + IO/Legacy/vtkGenericDataObjectReader.h | 2 + IO/Legacy/vtkGenericDataObjectWriter.cxx | 2 + IO/Legacy/vtkGenericDataObjectWriter.h | 2 + IO/Legacy/vtkGraphReader.cxx | 2 + IO/Legacy/vtkGraphReader.h | 2 + IO/Legacy/vtkGraphWriter.cxx | 2 + IO/Legacy/vtkGraphWriter.h | 2 + IO/Legacy/vtkLegacyReaderVersion.h | 2 + IO/Legacy/vtkPixelExtentIO.cxx | 2 + IO/Legacy/vtkPixelExtentIO.h | 2 + IO/Legacy/vtkPolyDataReader.cxx | 2 + IO/Legacy/vtkPolyDataReader.h | 2 + IO/Legacy/vtkPolyDataWriter.cxx | 2 + IO/Legacy/vtkPolyDataWriter.h | 2 + IO/Legacy/vtkRectilinearGridReader.cxx | 2 + IO/Legacy/vtkRectilinearGridReader.h | 2 + IO/Legacy/vtkRectilinearGridWriter.cxx | 2 + IO/Legacy/vtkRectilinearGridWriter.h | 2 + IO/Legacy/vtkSimplePointsReader.cxx | 2 + IO/Legacy/vtkSimplePointsReader.h | 2 + IO/Legacy/vtkSimplePointsWriter.cxx | 2 + IO/Legacy/vtkSimplePointsWriter.h | 2 + IO/Legacy/vtkStructuredGridReader.cxx | 2 + IO/Legacy/vtkStructuredGridReader.h | 2 + IO/Legacy/vtkStructuredGridWriter.cxx | 2 + IO/Legacy/vtkStructuredGridWriter.h | 2 + IO/Legacy/vtkStructuredPointsReader.cxx | 2 + IO/Legacy/vtkStructuredPointsReader.h | 2 + IO/Legacy/vtkStructuredPointsWriter.cxx | 2 + IO/Legacy/vtkStructuredPointsWriter.h | 2 + IO/Legacy/vtkTableReader.cxx | 2 + IO/Legacy/vtkTableReader.h | 2 + IO/Legacy/vtkTableWriter.cxx | 2 + IO/Legacy/vtkTableWriter.h | 2 + IO/Legacy/vtkTreeReader.cxx | 2 + IO/Legacy/vtkTreeReader.h | 2 + IO/Legacy/vtkTreeWriter.cxx | 2 + IO/Legacy/vtkTreeWriter.h | 2 + IO/Legacy/vtkUnstructuredGridReader.cxx | 2 + IO/Legacy/vtkUnstructuredGridReader.h | 2 + IO/Legacy/vtkUnstructuredGridWriter.cxx | 2 + IO/Legacy/vtkUnstructuredGridWriter.h | 2 + IO/MINC/vtkMINCImageAttributes.cxx | 2 + IO/MINC/vtkMINCImageAttributes.h | 2 + IO/MINC/vtkMINCImageReader.cxx | 2 + IO/MINC/vtkMINCImageReader.h | 2 + IO/MINC/vtkMINCImageWriter.cxx | 2 + IO/MINC/vtkMINCImageWriter.h | 2 + IO/MINC/vtkMNIObjectReader.cxx | 2 + IO/MINC/vtkMNIObjectReader.h | 2 + IO/MINC/vtkMNIObjectWriter.cxx | 2 + IO/MINC/vtkMNIObjectWriter.h | 2 + IO/MINC/vtkMNITagPointReader.cxx | 2 + IO/MINC/vtkMNITagPointReader.h | 2 + IO/MINC/vtkMNITagPointWriter.cxx | 2 + IO/MINC/vtkMNITagPointWriter.h | 2 + IO/MINC/vtkMNITransformReader.cxx | 2 + IO/MINC/vtkMNITransformReader.h | 2 + IO/MINC/vtkMNITransformWriter.cxx | 2 + IO/MINC/vtkMNITransformWriter.h | 2 + IO/MPIImage/vtkMPIImageReader.cxx | 2 + IO/MPIImage/vtkMPIImageReader.h | 2 + IO/MPIImage/vtkPNrrdReader.cxx | 2 + IO/MPIImage/vtkPNrrdReader.h | 2 + .../vtkMPIMultiBlockPLOT3DReader.cxx | 2 + IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.h | 2 + IO/MPIParallel/vtkPWindBladeReader.cxx | 2 + IO/MPIParallel/vtkPWindBladeReader.h | 2 + IO/MotionFX/vtkMotionFXCFGGrammar.h | 11 +- IO/MotionFX/vtkMotionFXCFGReader.cxx | 12 + IO/MotionFX/vtkMotionFXCFGReader.h | 2 + IO/Movie/vtkAVIWriter.cxx | 2 + IO/Movie/vtkAVIWriter.h | 2 + IO/Movie/vtkGenericMovieWriter.cxx | 2 + IO/Movie/vtkGenericMovieWriter.h | 2 + IO/Movie/vtkMP4Writer.cxx | 2 + IO/Movie/vtkMP4Writer.h | 2 + IO/MySQL/vtkIOMySQL_AutoInit.cxx | 2 + IO/MySQL/vtkMySQLDatabase.cxx | 2 + IO/MySQL/vtkMySQLDatabase.h | 2 + IO/MySQL/vtkMySQLDatabasePrivate.h | 2 + IO/MySQL/vtkMySQLQuery.cxx | 2 + IO/MySQL/vtkMySQLQuery.h | 2 + IO/MySQL/vtkMySQLToTableReader.cxx | 2 + IO/MySQL/vtkMySQLToTableReader.h | 2 + IO/MySQL/vtkTableToMySQLWriter.cxx | 2 + IO/MySQL/vtkTableToMySQLWriter.h | 2 + IO/NetCDF/vtkMPASReader.cxx | 2 + IO/NetCDF/vtkMPASReader.h | 2 + IO/NetCDF/vtkNetCDFCAMReader.cxx | 2 + IO/NetCDF/vtkNetCDFCAMReader.h | 2 + IO/NetCDF/vtkNetCDFCFReader.cxx | 2 + IO/NetCDF/vtkNetCDFCFReader.h | 2 + IO/NetCDF/vtkNetCDFCFWriter.cxx | 2 + IO/NetCDF/vtkNetCDFCFWriter.h | 2 + IO/NetCDF/vtkNetCDFPOPReader.cxx | 2 + IO/NetCDF/vtkNetCDFPOPReader.h | 2 + IO/NetCDF/vtkNetCDFReader.cxx | 2 + IO/NetCDF/vtkNetCDFReader.h | 2 + IO/NetCDF/vtkSLACParticleReader.cxx | 4 + IO/NetCDF/vtkSLACParticleReader.h | 2 + IO/NetCDF/vtkSLACReader.cxx | 4 + IO/NetCDF/vtkSLACReader.h | 2 + IO/OCCT/vtkOCCTReader.cxx | 3 + IO/OCCT/vtkOCCTReader.h | 3 + IO/ODBC/vtkIOODBC_AutoInit.cxx | 2 + IO/ODBC/vtkODBCDatabase.cxx | 2 + IO/ODBC/vtkODBCDatabase.h | 2 + IO/ODBC/vtkODBCInternals.h | 2 + IO/ODBC/vtkODBCQuery.cxx | 2 + IO/ODBC/vtkODBCQuery.h | 2 + IO/OMF/core/OMFElement.cxx | 2 + IO/OMF/core/OMFElement.h | 4 + IO/OMF/core/OMFFile.cxx | 5 +- IO/OMF/core/OMFFile.h | 4 + IO/OMF/core/OMFHelpers.cxx | 2 + IO/OMF/core/OMFHelpers.h | 4 + IO/OMF/core/OMFProject.cxx | 2 + IO/OMF/core/OMFProject.h | 6 + IO/OMF/vtkOMFReader.cxx | 2 + IO/OMF/vtkOMFReader.h | 2 + IO/OggTheora/vtkOggTheoraWriter.cxx | 2 + IO/OggTheora/vtkOggTheoraWriter.h | 2 + IO/OpenVDB/vtkOpenVDBReader.cxx | 2 + IO/OpenVDB/vtkOpenVDBReader.h | 2 + IO/OpenVDB/vtkOpenVDBWriter.cxx | 2 + IO/OpenVDB/vtkOpenVDBWriter.h | 2 + IO/PDAL/vtkPDALReader.cxx | 2 + IO/PDAL/vtkPDALReader.h | 3 + IO/PIO/BHTree.cxx | 2 + IO/PIO/BHTree.h | 4 + IO/PIO/PIOAdaptor.cxx | 6 + IO/PIO/PIOAdaptor.h | 2 + IO/PIO/PIOData.cxx | 2 + IO/PIO/PIOData.h | 4 + IO/PIO/vtkPIOReader.cxx | 2 + IO/PIO/vtkPIOReader.h | 2 + IO/PLY/vtkPLY.cxx | 2 + IO/PLY/vtkPLY.h | 2 + IO/PLY/vtkPLYReader.cxx | 2 + IO/PLY/vtkPLYReader.h | 2 + IO/PLY/vtkPLYWriter.cxx | 2 + IO/PLY/vtkPLYWriter.h | 2 + IO/Parallel/vtkEnSightWriter.cxx | 2 + IO/Parallel/vtkEnSightWriter.h | 2 + IO/Parallel/vtkMultiBlockPLOT3DReader.cxx | 7 + IO/Parallel/vtkMultiBlockPLOT3DReader.h | 7 + .../vtkMultiBlockPLOT3DReaderInternals.cxx | 2 + .../vtkMultiBlockPLOT3DReaderInternals.h | 4 + IO/Parallel/vtkPChacoReader.cxx | 2 + IO/Parallel/vtkPChacoReader.h | 2 + IO/Parallel/vtkPDataSetReader.cxx | 2 + IO/Parallel/vtkPDataSetReader.h | 2 + IO/Parallel/vtkPDataSetWriter.cxx | 2 + IO/Parallel/vtkPDataSetWriter.h | 2 + IO/Parallel/vtkPImageWriter.cxx | 2 + IO/Parallel/vtkPImageWriter.h | 2 + IO/Parallel/vtkPOpenFOAMReader.cxx | 2 + IO/Parallel/vtkPOpenFOAMReader.h | 2 + IO/Parallel/vtkPlot3DMetaReader.cxx | 2 + IO/Parallel/vtkPlot3DMetaReader.h | 2 + IO/ParallelExodus/vtkPExodusIIReader.cxx | 2 + IO/ParallelExodus/vtkPExodusIIReader.h | 2 + IO/ParallelExodus/vtkPExodusIIWriter.cxx | 2 + IO/ParallelExodus/vtkPExodusIIWriter.h | 2 + IO/ParallelLSDyna/vtkPLSDynaReader.cxx | 2 + IO/ParallelLSDyna/vtkPLSDynaReader.h | 2 + IO/ParallelNetCDF/vtkPNetCDFPOPReader.cxx | 2 + IO/ParallelNetCDF/vtkPNetCDFPOPReader.h | 2 + IO/ParallelNetCDF/vtkPSLACReader.cxx | 7 +- IO/ParallelNetCDF/vtkPSLACReader.h | 2 + .../vtkXMLCompositeDataSetWriterHelper.cxx | 2 + .../vtkXMLCompositeDataSetWriterHelper.h | 2 + IO/ParallelXML/vtkXMLDataWriterHelper.cxx | 2 + IO/ParallelXML/vtkXMLDataWriterHelper.h | 2 + IO/ParallelXML/vtkXMLPDataObjectWriter.cxx | 2 + IO/ParallelXML/vtkXMLPDataObjectWriter.h | 2 + IO/ParallelXML/vtkXMLPDataSetWriter.cxx | 2 + IO/ParallelXML/vtkXMLPDataSetWriter.h | 2 + IO/ParallelXML/vtkXMLPDataWriter.cxx | 2 + IO/ParallelXML/vtkXMLPDataWriter.h | 2 + .../vtkXMLPHierarchicalBoxDataWriter.cxx | 2 + .../vtkXMLPHierarchicalBoxDataWriter.h | 2 + IO/ParallelXML/vtkXMLPHyperTreeGridWriter.cxx | 2 + IO/ParallelXML/vtkXMLPHyperTreeGridWriter.h | 2 + IO/ParallelXML/vtkXMLPImageDataWriter.cxx | 2 + IO/ParallelXML/vtkXMLPImageDataWriter.h | 2 + .../vtkXMLPMultiBlockDataWriter.cxx | 2 + IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h | 2 + IO/ParallelXML/vtkXMLPPolyDataWriter.cxx | 2 + IO/ParallelXML/vtkXMLPPolyDataWriter.h | 2 + .../vtkXMLPRectilinearGridWriter.cxx | 2 + IO/ParallelXML/vtkXMLPRectilinearGridWriter.h | 2 + .../vtkXMLPStructuredDataWriter.cxx | 2 + IO/ParallelXML/vtkXMLPStructuredDataWriter.h | 2 + .../vtkXMLPStructuredGridWriter.cxx | 2 + IO/ParallelXML/vtkXMLPStructuredGridWriter.h | 2 + IO/ParallelXML/vtkXMLPTableWriter.cxx | 2 + IO/ParallelXML/vtkXMLPTableWriter.h | 2 + .../vtkXMLPUniformGridAMRWriter.cxx | 2 + IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h | 2 + .../vtkXMLPUnstructuredDataWriter.cxx | 2 + .../vtkXMLPUnstructuredDataWriter.h | 2 + .../vtkXMLPUnstructuredGridWriter.cxx | 2 + .../vtkXMLPUnstructuredGridWriter.h | 2 + ...kXMLPartitionedDataSetCollectionWriter.cxx | 2 + ...vtkXMLPartitionedDataSetCollectionWriter.h | 2 + .../vtkXMLPartitionedDataSetWriter.cxx | 2 + .../vtkXMLPartitionedDataSetWriter.h | 2 + IO/ParallelXML/vtkXMLWriter2.cxx | 2 + IO/ParallelXML/vtkXMLWriter2.h | 2 + IO/ParallelXdmf3/vtkPXdmf3Writer.cxx | 2 + IO/ParallelXdmf3/vtkPXdmf3Writer.h | 2 + IO/PostgreSQL/vtkIOPostgreSQL_AutoInit.cxx | 2 + IO/PostgreSQL/vtkPostgreSQLDatabase.cxx | 2 + IO/PostgreSQL/vtkPostgreSQLDatabase.h | 2 + IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h | 2 + IO/PostgreSQL/vtkPostgreSQLQuery.cxx | 2 + IO/PostgreSQL/vtkPostgreSQLQuery.h | 2 + IO/PostgreSQL/vtkPostgreSQLToTableReader.cxx | 2 + IO/PostgreSQL/vtkPostgreSQLToTableReader.h | 2 + IO/PostgreSQL/vtkTableToPostgreSQLWriter.cxx | 2 + IO/PostgreSQL/vtkTableToPostgreSQLWriter.h | 2 + IO/SQL/vtkDatabaseToTableReader.cxx | 2 + IO/SQL/vtkDatabaseToTableReader.h | 2 + IO/SQL/vtkRowQuery.cxx | 2 + IO/SQL/vtkRowQuery.h | 2 + IO/SQL/vtkRowQueryToTable.cxx | 2 + IO/SQL/vtkRowQueryToTable.h | 2 + IO/SQL/vtkSQLDatabase.cxx | 2 + IO/SQL/vtkSQLDatabase.h | 2 + IO/SQL/vtkSQLDatabaseGraphSource.cxx | 2 + IO/SQL/vtkSQLDatabaseGraphSource.h | 2 + IO/SQL/vtkSQLDatabaseSchema.cxx | 2 + IO/SQL/vtkSQLDatabaseSchema.h | 2 + IO/SQL/vtkSQLDatabaseTableSource.cxx | 2 + IO/SQL/vtkSQLDatabaseTableSource.h | 2 + IO/SQL/vtkSQLGraphReader.cxx | 2 + IO/SQL/vtkSQLGraphReader.h | 2 + IO/SQL/vtkSQLQuery.cxx | 2 + IO/SQL/vtkSQLQuery.h | 2 + IO/SQL/vtkSQLiteDatabase.cxx | 2 + IO/SQL/vtkSQLiteDatabase.h | 2 + IO/SQL/vtkSQLiteDatabaseInternals.h | 2 + IO/SQL/vtkSQLiteQuery.cxx | 2 + IO/SQL/vtkSQLiteQuery.h | 2 + IO/SQL/vtkSQLiteToTableReader.cxx | 2 + IO/SQL/vtkSQLiteToTableReader.h | 2 + IO/SQL/vtkTableToDatabaseWriter.cxx | 2 + IO/SQL/vtkTableToDatabaseWriter.h | 2 + IO/SQL/vtkTableToSQLiteWriter.cxx | 2 + IO/SQL/vtkTableToSQLiteWriter.h | 2 + IO/SegY/vtkSegYBinaryHeaderBytesPositions.h | 2 + IO/SegY/vtkSegYIOUtils.cxx | 2 + IO/SegY/vtkSegYIOUtils.h | 4 + IO/SegY/vtkSegYReader.cxx | 2 + IO/SegY/vtkSegYReader.h | 2 + IO/SegY/vtkSegYReaderInternal.cxx | 2 + IO/SegY/vtkSegYReaderInternal.h | 4 + IO/SegY/vtkSegYTraceHeaderBytesPositions.h | 2 + IO/SegY/vtkSegYTraceReader.cxx | 2 + IO/SegY/vtkSegYTraceReader.h | 4 + IO/TRUCHAS/vtkTRUCHASReader.cxx | 2 + IO/TRUCHAS/vtkTRUCHASReader.h | 2 + IO/TecplotTable/vtkTecplotTableReader.cxx | 2 + IO/TecplotTable/vtkTecplotTableReader.h | 2 + IO/VPIC/vtkVPICReader.cxx | 2 + IO/VPIC/vtkVPICReader.h | 8 +- IO/VeraOut/vtkVeraOutReader.cxx | 3 + IO/VeraOut/vtkVeraOutReader.h | 2 + IO/Video/vtkVideoSource.cxx | 2 + IO/Video/vtkVideoSource.h | 2 + IO/Video/vtkWin32VideoSource.cxx | 2 + IO/Video/vtkWin32VideoSource.h | 2 + IO/XML/vtkRTXMLPolyDataReader.cxx | 2 + IO/XML/vtkRTXMLPolyDataReader.h | 2 + IO/XML/vtkXMLCompositeDataReader.cxx | 2 + IO/XML/vtkXMLCompositeDataReader.h | 4 + IO/XML/vtkXMLCompositeDataWriter.cxx | 2 + IO/XML/vtkXMLCompositeDataWriter.h | 2 + IO/XML/vtkXMLDataObjectWriter.cxx | 2 + IO/XML/vtkXMLDataObjectWriter.h | 2 + IO/XML/vtkXMLDataReader.cxx | 2 + IO/XML/vtkXMLDataReader.h | 2 + IO/XML/vtkXMLDataSetWriter.cxx | 2 + IO/XML/vtkXMLDataSetWriter.h | 2 + IO/XML/vtkXMLFileReadTester.cxx | 2 + IO/XML/vtkXMLFileReadTester.h | 2 + IO/XML/vtkXMLGenericDataObjectReader.cxx | 2 + IO/XML/vtkXMLGenericDataObjectReader.h | 2 + ...vtkXMLHierarchicalBoxDataFileConverter.cxx | 2 + .../vtkXMLHierarchicalBoxDataFileConverter.h | 2 + IO/XML/vtkXMLHierarchicalBoxDataReader.cxx | 2 + IO/XML/vtkXMLHierarchicalBoxDataReader.h | 2 + IO/XML/vtkXMLHierarchicalBoxDataWriter.cxx | 2 + IO/XML/vtkXMLHierarchicalBoxDataWriter.h | 2 + IO/XML/vtkXMLHierarchicalDataReader.cxx | 2 + IO/XML/vtkXMLHierarchicalDataReader.h | 2 + IO/XML/vtkXMLHyperTreeGridReader.cxx | 2 + IO/XML/vtkXMLHyperTreeGridReader.h | 2 + IO/XML/vtkXMLHyperTreeGridWriter.cxx | 2 + IO/XML/vtkXMLHyperTreeGridWriter.h | 2 + IO/XML/vtkXMLImageDataReader.cxx | 2 + IO/XML/vtkXMLImageDataReader.h | 2 + IO/XML/vtkXMLImageDataWriter.cxx | 2 + IO/XML/vtkXMLImageDataWriter.h | 2 + IO/XML/vtkXMLMultiBlockDataReader.cxx | 2 + IO/XML/vtkXMLMultiBlockDataReader.h | 2 + IO/XML/vtkXMLMultiBlockDataWriter.cxx | 2 + IO/XML/vtkXMLMultiBlockDataWriter.h | 2 + IO/XML/vtkXMLMultiGroupDataReader.cxx | 2 + IO/XML/vtkXMLMultiGroupDataReader.h | 2 + IO/XML/vtkXMLOffsetsManager.h | 2 + IO/XML/vtkXMLPDataObjectReader.cxx | 2 + IO/XML/vtkXMLPDataObjectReader.h | 2 + IO/XML/vtkXMLPDataReader.cxx | 2 + IO/XML/vtkXMLPDataReader.h | 2 + IO/XML/vtkXMLPHyperTreeGridReader.cxx | 2 + IO/XML/vtkXMLPHyperTreeGridReader.h | 2 + IO/XML/vtkXMLPImageDataReader.cxx | 2 + IO/XML/vtkXMLPImageDataReader.h | 2 + IO/XML/vtkXMLPPolyDataReader.cxx | 2 + IO/XML/vtkXMLPPolyDataReader.h | 2 + IO/XML/vtkXMLPRectilinearGridReader.cxx | 2 + IO/XML/vtkXMLPRectilinearGridReader.h | 2 + IO/XML/vtkXMLPStructuredDataReader.cxx | 2 + IO/XML/vtkXMLPStructuredDataReader.h | 2 + IO/XML/vtkXMLPStructuredGridReader.cxx | 2 + IO/XML/vtkXMLPStructuredGridReader.h | 2 + IO/XML/vtkXMLPTableReader.cxx | 2 + IO/XML/vtkXMLPTableReader.h | 2 + IO/XML/vtkXMLPUnstructuredDataReader.cxx | 2 + IO/XML/vtkXMLPUnstructuredDataReader.h | 2 + IO/XML/vtkXMLPUnstructuredGridReader.cxx | 2 + IO/XML/vtkXMLPUnstructuredGridReader.h | 2 + ...kXMLPartitionedDataSetCollectionReader.cxx | 2 + ...vtkXMLPartitionedDataSetCollectionReader.h | 2 + IO/XML/vtkXMLPartitionedDataSetReader.cxx | 2 + IO/XML/vtkXMLPartitionedDataSetReader.h | 2 + IO/XML/vtkXMLPolyDataReader.cxx | 2 + IO/XML/vtkXMLPolyDataReader.h | 2 + IO/XML/vtkXMLPolyDataWriter.cxx | 2 + IO/XML/vtkXMLPolyDataWriter.h | 2 + IO/XML/vtkXMLReader.cxx | 2 + IO/XML/vtkXMLReader.h | 2 + IO/XML/vtkXMLReaderVersion.h | 2 + IO/XML/vtkXMLRectilinearGridReader.cxx | 2 + IO/XML/vtkXMLRectilinearGridReader.h | 2 + IO/XML/vtkXMLRectilinearGridWriter.cxx | 2 + IO/XML/vtkXMLRectilinearGridWriter.h | 2 + IO/XML/vtkXMLStructuredDataReader.cxx | 2 + IO/XML/vtkXMLStructuredDataReader.h | 2 + IO/XML/vtkXMLStructuredDataWriter.cxx | 2 + IO/XML/vtkXMLStructuredDataWriter.h | 2 + IO/XML/vtkXMLStructuredGridReader.cxx | 2 + IO/XML/vtkXMLStructuredGridReader.h | 2 + IO/XML/vtkXMLStructuredGridWriter.cxx | 2 + IO/XML/vtkXMLStructuredGridWriter.h | 2 + IO/XML/vtkXMLTableReader.cxx | 2 + IO/XML/vtkXMLTableReader.h | 2 + IO/XML/vtkXMLTableWriter.cxx | 2 + IO/XML/vtkXMLTableWriter.h | 2 + IO/XML/vtkXMLUniformGridAMRReader.cxx | 2 + IO/XML/vtkXMLUniformGridAMRReader.h | 2 + IO/XML/vtkXMLUniformGridAMRWriter.cxx | 2 + IO/XML/vtkXMLUniformGridAMRWriter.h | 2 + IO/XML/vtkXMLUnstructuredDataReader.cxx | 2 + IO/XML/vtkXMLUnstructuredDataReader.h | 2 + IO/XML/vtkXMLUnstructuredDataWriter.cxx | 2 + IO/XML/vtkXMLUnstructuredDataWriter.h | 2 + IO/XML/vtkXMLUnstructuredGridReader.cxx | 2 + IO/XML/vtkXMLUnstructuredGridReader.h | 2 + IO/XML/vtkXMLUnstructuredGridWriter.cxx | 2 + IO/XML/vtkXMLUnstructuredGridWriter.h | 2 + IO/XML/vtkXMLWriter.cxx | 4 + IO/XML/vtkXMLWriter.h | 2 + IO/XML/vtkXMLWriterBase.cxx | 2 + IO/XML/vtkXMLWriterBase.h | 2 + IO/XML/vtkXMLWriterF.h | 2 + IO/XMLParser/vtkXMLDataHeaderPrivate.h | 2 + IO/XMLParser/vtkXMLDataParser.cxx | 2 + IO/XMLParser/vtkXMLDataParser.h | 2 + IO/XMLParser/vtkXMLParser.cxx | 2 + IO/XMLParser/vtkXMLParser.h | 2 + IO/XMLParser/vtkXMLUtilities.cxx | 2 + IO/XMLParser/vtkXMLUtilities.h | 2 + IO/Xdmf2/vtkSILBuilder.cxx | 2 + IO/Xdmf2/vtkSILBuilder.h | 2 + IO/Xdmf2/vtkXdmfDataArray.cxx | 2 + IO/Xdmf2/vtkXdmfDataArray.h | 5 +- IO/Xdmf2/vtkXdmfHeavyData.cxx | 2 + IO/Xdmf2/vtkXdmfHeavyData.h | 2 + IO/Xdmf2/vtkXdmfReader.cxx | 2 + IO/Xdmf2/vtkXdmfReader.h | 2 + IO/Xdmf2/vtkXdmfReaderInternal.cxx | 6 +- IO/Xdmf2/vtkXdmfReaderInternal.h | 2 + IO/Xdmf2/vtkXdmfWriter.cxx | 3 + IO/Xdmf2/vtkXdmfWriter.h | 22 +- IO/Xdmf3/vtkXdmf3ArrayKeeper.cxx | 2 + IO/Xdmf3/vtkXdmf3ArrayKeeper.h | 3 + IO/Xdmf3/vtkXdmf3ArraySelection.cxx | 2 + IO/Xdmf3/vtkXdmf3ArraySelection.h | 2 + IO/Xdmf3/vtkXdmf3DataSet.cxx | 2 + IO/Xdmf3/vtkXdmf3DataSet.h | 23 +- IO/Xdmf3/vtkXdmf3HeavyDataHandler.cxx | 2 + IO/Xdmf3/vtkXdmf3HeavyDataHandler.h | 2 + IO/Xdmf3/vtkXdmf3LightDataHandler.cxx | 2 + IO/Xdmf3/vtkXdmf3LightDataHandler.h | 7 +- IO/Xdmf3/vtkXdmf3Reader.cxx | 2 + IO/Xdmf3/vtkXdmf3Reader.h | 2 + IO/Xdmf3/vtkXdmf3SILBuilder.cxx | 2 + IO/Xdmf3/vtkXdmf3SILBuilder.h | 2 + IO/Xdmf3/vtkXdmf3Writer.cxx | 2 + IO/Xdmf3/vtkXdmf3Writer.h | 2 + Imaging/Color/vtkImageHSIToRGB.cxx | 2 + Imaging/Color/vtkImageHSIToRGB.h | 2 + Imaging/Color/vtkImageHSVToRGB.cxx | 2 + Imaging/Color/vtkImageHSVToRGB.h | 2 + Imaging/Color/vtkImageLuminance.cxx | 2 + Imaging/Color/vtkImageLuminance.h | 2 + Imaging/Color/vtkImageMapToRGBA.cxx | 2 + Imaging/Color/vtkImageMapToRGBA.h | 2 + .../Color/vtkImageMapToWindowLevelColors.cxx | 2 + .../Color/vtkImageMapToWindowLevelColors.h | 2 + Imaging/Color/vtkImageQuantizeRGBToIndex.cxx | 2 + Imaging/Color/vtkImageQuantizeRGBToIndex.h | 2 + Imaging/Color/vtkImageRGBToHSI.cxx | 2 + Imaging/Color/vtkImageRGBToHSI.h | 2 + Imaging/Color/vtkImageRGBToHSV.cxx | 2 + Imaging/Color/vtkImageRGBToHSV.h | 2 + Imaging/Color/vtkImageRGBToYIQ.cxx | 2 + Imaging/Color/vtkImageRGBToYIQ.h | 2 + Imaging/Color/vtkImageYIQToRGB.cxx | 2 + Imaging/Color/vtkImageYIQToRGB.h | 2 + Imaging/Core/vtkAbstractImageInterpolator.cxx | 2 + Imaging/Core/vtkAbstractImageInterpolator.h | 2 + Imaging/Core/vtkExtractVOI.cxx | 2 + Imaging/Core/vtkExtractVOI.h | 2 + Imaging/Core/vtkGenericImageInterpolator.cxx | 2 + Imaging/Core/vtkGenericImageInterpolator.h | 2 + Imaging/Core/vtkImageAppendComponents.cxx | 2 + Imaging/Core/vtkImageAppendComponents.h | 2 + Imaging/Core/vtkImageBSplineCoefficients.cxx | 2 + Imaging/Core/vtkImageBSplineCoefficients.h | 2 + Imaging/Core/vtkImageBSplineInternals.cxx | 2 + Imaging/Core/vtkImageBSplineInternals.h | 2 + Imaging/Core/vtkImageBSplineInterpolator.cxx | 2 + Imaging/Core/vtkImageBSplineInterpolator.h | 2 + Imaging/Core/vtkImageBlend.cxx | 2 + Imaging/Core/vtkImageBlend.h | 2 + Imaging/Core/vtkImageCacheFilter.cxx | 2 + Imaging/Core/vtkImageCacheFilter.h | 2 + Imaging/Core/vtkImageCast.cxx | 2 + Imaging/Core/vtkImageCast.h | 2 + Imaging/Core/vtkImageChangeInformation.cxx | 2 + Imaging/Core/vtkImageChangeInformation.h | 2 + Imaging/Core/vtkImageClip.cxx | 2 + Imaging/Core/vtkImageClip.h | 2 + Imaging/Core/vtkImageConstantPad.cxx | 2 + Imaging/Core/vtkImageConstantPad.h | 2 + Imaging/Core/vtkImageDataStreamer.cxx | 2 + Imaging/Core/vtkImageDataStreamer.h | 2 + Imaging/Core/vtkImageDecomposeFilter.cxx | 2 + Imaging/Core/vtkImageDecomposeFilter.h | 2 + Imaging/Core/vtkImageDifference.cxx | 2 + Imaging/Core/vtkImageDifference.h | 2 + Imaging/Core/vtkImageExtractComponents.cxx | 2 + Imaging/Core/vtkImageExtractComponents.h | 2 + Imaging/Core/vtkImageFlip.cxx | 2 + Imaging/Core/vtkImageFlip.h | 2 + Imaging/Core/vtkImageInterpolator.cxx | 2 + Imaging/Core/vtkImageInterpolator.h | 2 + Imaging/Core/vtkImageInterpolatorInternals.h | 2 + Imaging/Core/vtkImageIterateFilter.cxx | 2 + Imaging/Core/vtkImageIterateFilter.h | 2 + Imaging/Core/vtkImageMagnify.cxx | 2 + Imaging/Core/vtkImageMagnify.h | 2 + Imaging/Core/vtkImageMapToColors.cxx | 2 + Imaging/Core/vtkImageMapToColors.h | 2 + Imaging/Core/vtkImageMask.cxx | 2 + Imaging/Core/vtkImageMask.h | 2 + Imaging/Core/vtkImageMirrorPad.cxx | 2 + Imaging/Core/vtkImageMirrorPad.h | 2 + Imaging/Core/vtkImagePadFilter.cxx | 2 + Imaging/Core/vtkImagePadFilter.h | 2 + Imaging/Core/vtkImagePermute.cxx | 2 + Imaging/Core/vtkImagePermute.h | 2 + Imaging/Core/vtkImagePointDataIterator.cxx | 2 + Imaging/Core/vtkImagePointDataIterator.h | 2 + Imaging/Core/vtkImagePointIterator.cxx | 2 + Imaging/Core/vtkImagePointIterator.h | 2 + Imaging/Core/vtkImageProbeFilter.cxx | 2 + Imaging/Core/vtkImageProbeFilter.h | 2 + Imaging/Core/vtkImageResample.cxx | 2 + Imaging/Core/vtkImageResample.h | 2 + Imaging/Core/vtkImageResize.cxx | 2 + Imaging/Core/vtkImageResize.h | 2 + Imaging/Core/vtkImageReslice.cxx | 2 + Imaging/Core/vtkImageReslice.h | 2 + Imaging/Core/vtkImageResliceToColors.cxx | 2 + Imaging/Core/vtkImageResliceToColors.h | 2 + Imaging/Core/vtkImageShiftScale.cxx | 2 + Imaging/Core/vtkImageShiftScale.h | 2 + Imaging/Core/vtkImageShrink3D.cxx | 2 + Imaging/Core/vtkImageShrink3D.h | 2 + Imaging/Core/vtkImageSincInterpolator.cxx | 2 + Imaging/Core/vtkImageSincInterpolator.h | 2 + Imaging/Core/vtkImageStencilAlgorithm.cxx | 2 + Imaging/Core/vtkImageStencilAlgorithm.h | 2 + Imaging/Core/vtkImageStencilData.cxx | 2 + Imaging/Core/vtkImageStencilData.h | 2 + Imaging/Core/vtkImageStencilIterator.cxx | 2 + Imaging/Core/vtkImageStencilIterator.h | 2 + Imaging/Core/vtkImageStencilSource.cxx | 2 + Imaging/Core/vtkImageStencilSource.h | 2 + Imaging/Core/vtkImageThreshold.cxx | 2 + Imaging/Core/vtkImageThreshold.h | 2 + Imaging/Core/vtkImageTranslateExtent.cxx | 2 + Imaging/Core/vtkImageTranslateExtent.h | 2 + Imaging/Core/vtkImageWrapPad.cxx | 2 + Imaging/Core/vtkImageWrapPad.h | 2 + Imaging/Core/vtkRTAnalyticSource.cxx | 2 + Imaging/Core/vtkRTAnalyticSource.h | 2 + .../Fourier/vtkImageButterworthHighPass.cxx | 2 + Imaging/Fourier/vtkImageButterworthHighPass.h | 2 + .../Fourier/vtkImageButterworthLowPass.cxx | 2 + Imaging/Fourier/vtkImageButterworthLowPass.h | 2 + Imaging/Fourier/vtkImageFFT.cxx | 2 + Imaging/Fourier/vtkImageFFT.h | 2 + Imaging/Fourier/vtkImageFourierCenter.cxx | 2 + Imaging/Fourier/vtkImageFourierCenter.h | 2 + Imaging/Fourier/vtkImageFourierFilter.cxx | 2 + Imaging/Fourier/vtkImageFourierFilter.h | 2 + Imaging/Fourier/vtkImageIdealHighPass.cxx | 2 + Imaging/Fourier/vtkImageIdealHighPass.h | 2 + Imaging/Fourier/vtkImageIdealLowPass.cxx | 2 + Imaging/Fourier/vtkImageIdealLowPass.h | 2 + Imaging/Fourier/vtkImageRFFT.cxx | 2 + Imaging/Fourier/vtkImageRFFT.h | 2 + .../vtkImageAnisotropicDiffusion2D.cxx | 2 + .../General/vtkImageAnisotropicDiffusion2D.h | 2 + .../vtkImageAnisotropicDiffusion3D.cxx | 2 + .../General/vtkImageAnisotropicDiffusion3D.h | 2 + Imaging/General/vtkImageCheckerboard.cxx | 2 + Imaging/General/vtkImageCheckerboard.h | 2 + Imaging/General/vtkImageCityBlockDistance.cxx | 2 + Imaging/General/vtkImageCityBlockDistance.h | 2 + Imaging/General/vtkImageConvolve.cxx | 2 + Imaging/General/vtkImageConvolve.h | 2 + Imaging/General/vtkImageCorrelation.cxx | 2 + Imaging/General/vtkImageCorrelation.h | 2 + Imaging/General/vtkImageEuclideanDistance.cxx | 2 + Imaging/General/vtkImageEuclideanDistance.h | 2 + Imaging/General/vtkImageEuclideanToPolar.cxx | 2 + Imaging/General/vtkImageEuclideanToPolar.h | 2 + Imaging/General/vtkImageGaussianSmooth.cxx | 2 + Imaging/General/vtkImageGaussianSmooth.h | 2 + Imaging/General/vtkImageGradient.cxx | 2 + Imaging/General/vtkImageGradient.h | 2 + Imaging/General/vtkImageGradientMagnitude.cxx | 2 + Imaging/General/vtkImageGradientMagnitude.h | 2 + Imaging/General/vtkImageHybridMedian2D.cxx | 2 + Imaging/General/vtkImageHybridMedian2D.h | 2 + Imaging/General/vtkImageLaplacian.cxx | 2 + Imaging/General/vtkImageLaplacian.h | 2 + Imaging/General/vtkImageMedian3D.cxx | 2 + Imaging/General/vtkImageMedian3D.h | 2 + Imaging/General/vtkImageNormalize.cxx | 2 + Imaging/General/vtkImageNormalize.h | 2 + Imaging/General/vtkImageRange3D.cxx | 2 + Imaging/General/vtkImageRange3D.h | 2 + .../General/vtkImageSeparableConvolution.cxx | 2 + .../General/vtkImageSeparableConvolution.h | 2 + Imaging/General/vtkImageSlab.cxx | 2 + Imaging/General/vtkImageSlab.h | 2 + Imaging/General/vtkImageSlabReslice.cxx | 2 + Imaging/General/vtkImageSlabReslice.h | 2 + Imaging/General/vtkImageSobel2D.cxx | 2 + Imaging/General/vtkImageSobel2D.h | 2 + Imaging/General/vtkImageSobel3D.cxx | 2 + Imaging/General/vtkImageSobel3D.h | 2 + Imaging/General/vtkImageSpatialAlgorithm.cxx | 2 + Imaging/General/vtkImageSpatialAlgorithm.h | 2 + Imaging/General/vtkImageVariance3D.cxx | 2 + Imaging/General/vtkImageVariance3D.h | 2 + Imaging/Hybrid/vtkBooleanTexture.cxx | 2 + Imaging/Hybrid/vtkBooleanTexture.h | 2 + Imaging/Hybrid/vtkCheckerboardSplatter.cxx | 2 + Imaging/Hybrid/vtkCheckerboardSplatter.h | 2 + Imaging/Hybrid/vtkFastSplatter.cxx | 2 + Imaging/Hybrid/vtkFastSplatter.h | 2 + Imaging/Hybrid/vtkGaussianSplatter.cxx | 2 + Imaging/Hybrid/vtkGaussianSplatter.h | 2 + Imaging/Hybrid/vtkImageCursor3D.cxx | 2 + Imaging/Hybrid/vtkImageCursor3D.h | 2 + Imaging/Hybrid/vtkImageRectilinearWipe.cxx | 2 + Imaging/Hybrid/vtkImageRectilinearWipe.h | 2 + Imaging/Hybrid/vtkImageToPoints.cxx | 2 + Imaging/Hybrid/vtkImageToPoints.h | 2 + Imaging/Hybrid/vtkPointLoad.cxx | 2 + Imaging/Hybrid/vtkPointLoad.h | 2 + Imaging/Hybrid/vtkSampleFunction.cxx | 2 + Imaging/Hybrid/vtkSampleFunction.h | 2 + Imaging/Hybrid/vtkShepardMethod.cxx | 2 + Imaging/Hybrid/vtkShepardMethod.h | 2 + Imaging/Hybrid/vtkSliceCubes.cxx | 2 + Imaging/Hybrid/vtkSliceCubes.h | 2 + .../Hybrid/vtkSurfaceReconstructionFilter.cxx | 2 + .../Hybrid/vtkSurfaceReconstructionFilter.h | 2 + Imaging/Hybrid/vtkTriangularTexture.cxx | 2 + Imaging/Hybrid/vtkTriangularTexture.h | 2 + Imaging/Hybrid/vtkVoxelModeller.cxx | 2 + Imaging/Hybrid/vtkVoxelModeller.h | 2 + Imaging/Math/vtkImageDivergence.cxx | 2 + Imaging/Math/vtkImageDivergence.h | 2 + Imaging/Math/vtkImageDotProduct.cxx | 2 + Imaging/Math/vtkImageDotProduct.h | 2 + Imaging/Math/vtkImageLogarithmicScale.cxx | 2 + Imaging/Math/vtkImageLogarithmicScale.h | 2 + Imaging/Math/vtkImageLogic.cxx | 2 + Imaging/Math/vtkImageLogic.h | 2 + Imaging/Math/vtkImageMagnitude.cxx | 2 + Imaging/Math/vtkImageMagnitude.h | 2 + Imaging/Math/vtkImageMaskBits.cxx | 2 + Imaging/Math/vtkImageMaskBits.h | 2 + Imaging/Math/vtkImageMathematics.cxx | 2 + Imaging/Math/vtkImageMathematics.h | 2 + Imaging/Math/vtkImageWeightedSum.cxx | 2 + Imaging/Math/vtkImageWeightedSum.h | 2 + .../vtkImageConnectivityFilter.cxx | 2 + .../vtkImageConnectivityFilter.h | 2 + Imaging/Morphological/vtkImageConnector.cxx | 2 + Imaging/Morphological/vtkImageConnector.h | 2 + .../vtkImageContinuousDilate3D.cxx | 2 + .../vtkImageContinuousDilate3D.h | 2 + .../vtkImageContinuousErode3D.cxx | 2 + .../Morphological/vtkImageContinuousErode3D.h | 2 + .../Morphological/vtkImageDilateErode3D.cxx | 2 + Imaging/Morphological/vtkImageDilateErode3D.h | 2 + .../Morphological/vtkImageIslandRemoval2D.cxx | 2 + .../Morphological/vtkImageIslandRemoval2D.h | 2 + .../vtkImageNonMaximumSuppression.cxx | 2 + .../vtkImageNonMaximumSuppression.h | 2 + Imaging/Morphological/vtkImageOpenClose3D.cxx | 2 + Imaging/Morphological/vtkImageOpenClose3D.h | 2 + .../vtkImageSeedConnectivity.cxx | 2 + .../Morphological/vtkImageSeedConnectivity.h | 2 + Imaging/Morphological/vtkImageSkeleton2D.cxx | 2 + Imaging/Morphological/vtkImageSkeleton2D.h | 2 + .../vtkImageThresholdConnectivity.cxx | 2 + .../vtkImageThresholdConnectivity.h | 2 + Imaging/OpenGL2/vtkOpenGLImageGradient.cxx | 2 + Imaging/OpenGL2/vtkOpenGLImageGradient.h | 2 + Imaging/Sources/vtkImageCanvasSource2D.cxx | 2 + Imaging/Sources/vtkImageCanvasSource2D.h | 2 + Imaging/Sources/vtkImageEllipsoidSource.cxx | 2 + Imaging/Sources/vtkImageEllipsoidSource.h | 2 + Imaging/Sources/vtkImageGaussianSource.cxx | 2 + Imaging/Sources/vtkImageGaussianSource.h | 2 + Imaging/Sources/vtkImageGridSource.cxx | 2 + Imaging/Sources/vtkImageGridSource.h | 2 + Imaging/Sources/vtkImageMandelbrotSource.cxx | 2 + Imaging/Sources/vtkImageMandelbrotSource.h | 2 + Imaging/Sources/vtkImageNoiseSource.cxx | 2 + Imaging/Sources/vtkImageNoiseSource.h | 2 + Imaging/Sources/vtkImageSinusoidSource.cxx | 2 + Imaging/Sources/vtkImageSinusoidSource.h | 2 + Imaging/Statistics/vtkImageAccumulate.cxx | 2 + Imaging/Statistics/vtkImageAccumulate.h | 2 + Imaging/Statistics/vtkImageHistogram.cxx | 2 + Imaging/Statistics/vtkImageHistogram.h | 2 + .../vtkImageHistogramStatistics.cxx | 2 + .../Statistics/vtkImageHistogramStatistics.h | 2 + Imaging/Stencil/vtkImageStencil.cxx | 2 + Imaging/Stencil/vtkImageStencil.h | 2 + Imaging/Stencil/vtkImageStencilToImage.cxx | 2 + Imaging/Stencil/vtkImageStencilToImage.h | 2 + Imaging/Stencil/vtkImageToImageStencil.cxx | 2 + Imaging/Stencil/vtkImageToImageStencil.h | 2 + .../vtkImplicitFunctionToImageStencil.cxx | 2 + .../vtkImplicitFunctionToImageStencil.h | 2 + Imaging/Stencil/vtkLassoStencilSource.cxx | 2 + Imaging/Stencil/vtkLassoStencilSource.h | 2 + Imaging/Stencil/vtkPolyDataToImageStencil.cxx | 2 + Imaging/Stencil/vtkPolyDataToImageStencil.h | 2 + Imaging/Stencil/vtkROIStencilSource.cxx | 2 + Imaging/Stencil/vtkROIStencilSource.h | 2 + Infovis/Boost/vtkTryDowncast.h | 2 + .../vtkBoostBetweennessClustering.cxx | 3 + .../vtkBoostBetweennessClustering.h | 2 + .../vtkBoostBiconnectedComponents.cxx | 2 + .../vtkBoostBiconnectedComponents.h | 2 + .../vtkBoostBrandesCentrality.cxx | 2 + .../vtkBoostBrandesCentrality.h | 2 + .../vtkBoostBreadthFirstSearch.cxx | 2 + .../vtkBoostBreadthFirstSearch.h | 2 + .../vtkBoostBreadthFirstSearchTree.cxx | 2 + .../vtkBoostBreadthFirstSearchTree.h | 2 + .../vtkBoostConnectedComponents.cxx | 2 + .../vtkBoostConnectedComponents.h | 2 + .../vtkBoostDividedEdgeBundling.cxx | 2 + .../vtkBoostDividedEdgeBundling.h | 2 + .../vtkBoostExtractLargestComponent.cxx | 2 + .../vtkBoostExtractLargestComponent.h | 2 + .../vtkBoostGraphAdapter.h | 15 + .../vtkBoostKruskalMinimumSpanningTree.cxx | 2 + .../vtkBoostKruskalMinimumSpanningTree.h | 2 + .../vtkBoostLogWeighting.cxx | 2 + .../vtkBoostLogWeighting.h | 2 + .../vtkBoostPrimMinimumSpanningTree.cxx | 2 + .../vtkBoostPrimMinimumSpanningTree.h | 2 + .../vtkBoostRandomSparseArraySource.cxx | 2 + .../vtkBoostRandomSparseArraySource.h | 2 + .../vtkBoostSplitTableField.cxx | 2 + .../vtkBoostSplitTableField.h | 2 + Infovis/Core/vtkAddMembershipArray.cxx | 2 + Infovis/Core/vtkAddMembershipArray.h | 2 + .../Core/vtkAdjacencyMatrixToEdgeTable.cxx | 2 + Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h | 2 + Infovis/Core/vtkArrayNorm.cxx | 2 + Infovis/Core/vtkArrayNorm.h | 2 + Infovis/Core/vtkArrayToTable.cxx | 2 + Infovis/Core/vtkArrayToTable.h | 2 + Infovis/Core/vtkCollapseGraph.cxx | 2 + Infovis/Core/vtkCollapseGraph.h | 2 + Infovis/Core/vtkCollapseVerticesByArray.cxx | 2 + Infovis/Core/vtkCollapseVerticesByArray.h | 2 + Infovis/Core/vtkContinuousScatterplot.cxx | 2 + Infovis/Core/vtkContinuousScatterplot.h | 2 + Infovis/Core/vtkDataObjectToTable.cxx | 2 + Infovis/Core/vtkDataObjectToTable.h | 2 + Infovis/Core/vtkDotProductSimilarity.cxx | 2 + Infovis/Core/vtkDotProductSimilarity.h | 2 + Infovis/Core/vtkEdgeCenters.cxx | 2 + Infovis/Core/vtkEdgeCenters.h | 2 + Infovis/Core/vtkExpandSelectedGraph.cxx | 2 + Infovis/Core/vtkExpandSelectedGraph.h | 2 + Infovis/Core/vtkExtractSelectedGraph.cxx | 2 + Infovis/Core/vtkExtractSelectedGraph.h | 2 + Infovis/Core/vtkExtractSelectedTree.cxx | 2 + Infovis/Core/vtkExtractSelectedTree.h | 2 + Infovis/Core/vtkGenerateIndexArray.cxx | 2 + Infovis/Core/vtkGenerateIndexArray.h | 2 + .../Core/vtkGraphHierarchicalBundleEdges.cxx | 2 + .../Core/vtkGraphHierarchicalBundleEdges.h | 2 + Infovis/Core/vtkGroupLeafVertices.cxx | 2 + Infovis/Core/vtkGroupLeafVertices.h | 2 + Infovis/Core/vtkKCoreDecomposition.cxx | 2 + Infovis/Core/vtkKCoreDecomposition.h | 2 + Infovis/Core/vtkMergeColumns.cxx | 2 + Infovis/Core/vtkMergeColumns.h | 2 + Infovis/Core/vtkMergeGraphs.cxx | 2 + Infovis/Core/vtkMergeGraphs.h | 2 + Infovis/Core/vtkMergeTables.cxx | 2 + Infovis/Core/vtkMergeTables.h | 2 + Infovis/Core/vtkMutableGraphHelper.cxx | 2 + Infovis/Core/vtkMutableGraphHelper.h | 2 + Infovis/Core/vtkNetworkHierarchy.cxx | 2 + Infovis/Core/vtkNetworkHierarchy.h | 2 + Infovis/Core/vtkPipelineGraphSource.cxx | 2 + Infovis/Core/vtkPipelineGraphSource.h | 2 + Infovis/Core/vtkPruneTreeFilter.cxx | 2 + Infovis/Core/vtkPruneTreeFilter.h | 2 + Infovis/Core/vtkRandomGraphSource.cxx | 2 + Infovis/Core/vtkRandomGraphSource.h | 2 + Infovis/Core/vtkReduceTable.cxx | 2 + Infovis/Core/vtkReduceTable.h | 2 + Infovis/Core/vtkRemoveHiddenData.cxx | 2 + Infovis/Core/vtkRemoveHiddenData.h | 2 + Infovis/Core/vtkRemoveIsolatedVertices.cxx | 2 + Infovis/Core/vtkRemoveIsolatedVertices.h | 2 + Infovis/Core/vtkSparseArrayToTable.cxx | 2 + Infovis/Core/vtkSparseArrayToTable.h | 2 + Infovis/Core/vtkStreamGraph.cxx | 2 + Infovis/Core/vtkStreamGraph.h | 2 + Infovis/Core/vtkStringToCategory.cxx | 2 + Infovis/Core/vtkStringToCategory.h | 2 + Infovis/Core/vtkStringToNumeric.cxx | 2 + Infovis/Core/vtkStringToNumeric.h | 2 + Infovis/Core/vtkTableToArray.cxx | 2 + Infovis/Core/vtkTableToArray.h | 2 + Infovis/Core/vtkTableToGraph.cxx | 2 + Infovis/Core/vtkTableToGraph.h | 2 + Infovis/Core/vtkTableToSparseArray.cxx | 2 + Infovis/Core/vtkTableToSparseArray.h | 2 + Infovis/Core/vtkTableToTreeFilter.cxx | 2 + Infovis/Core/vtkTableToTreeFilter.h | 2 + Infovis/Core/vtkThresholdGraph.cxx | 2 + Infovis/Core/vtkThresholdGraph.h | 2 + Infovis/Core/vtkThresholdTable.cxx | 2 + Infovis/Core/vtkThresholdTable.h | 2 + Infovis/Core/vtkTransferAttributes.cxx | 2 + Infovis/Core/vtkTransferAttributes.h | 2 + Infovis/Core/vtkTransposeMatrix.cxx | 2 + Infovis/Core/vtkTransposeMatrix.h | 2 + Infovis/Core/vtkTreeDifferenceFilter.cxx | 2 + Infovis/Core/vtkTreeDifferenceFilter.h | 2 + Infovis/Core/vtkTreeFieldAggregator.cxx | 2 + Infovis/Core/vtkTreeFieldAggregator.h | 8 +- Infovis/Core/vtkTreeLevelsFilter.cxx | 2 + Infovis/Core/vtkTreeLevelsFilter.h | 2 + Infovis/Core/vtkVertexDegree.cxx | 2 + Infovis/Core/vtkVertexDegree.h | 2 + Infovis/Core/vtkWordCloud.cxx | 2 + Infovis/Core/vtkWordCloud.h | 2 + Infovis/Layout/vtkArcParallelEdgeStrategy.cxx | 2 + Infovis/Layout/vtkArcParallelEdgeStrategy.h | 2 + Infovis/Layout/vtkAreaLayout.cxx | 2 + Infovis/Layout/vtkAreaLayout.h | 2 + Infovis/Layout/vtkAreaLayoutStrategy.cxx | 2 + Infovis/Layout/vtkAreaLayoutStrategy.h | 2 + Infovis/Layout/vtkAssignCoordinates.cxx | 2 + Infovis/Layout/vtkAssignCoordinates.h | 2 + .../vtkAssignCoordinatesLayoutStrategy.cxx | 2 + .../vtkAssignCoordinatesLayoutStrategy.h | 2 + ...vtkAttributeClustering2DLayoutStrategy.cxx | 2 + .../vtkAttributeClustering2DLayoutStrategy.h | 2 + Infovis/Layout/vtkBoxLayoutStrategy.cxx | 2 + Infovis/Layout/vtkBoxLayoutStrategy.h | 2 + .../vtkCirclePackFrontChainLayoutStrategy.cxx | 2 + .../vtkCirclePackFrontChainLayoutStrategy.h | 2 + Infovis/Layout/vtkCirclePackLayout.cxx | 2 + Infovis/Layout/vtkCirclePackLayout.h | 2 + .../Layout/vtkCirclePackLayoutStrategy.cxx | 2 + Infovis/Layout/vtkCirclePackLayoutStrategy.h | 2 + Infovis/Layout/vtkCirclePackToPolyData.cxx | 2 + Infovis/Layout/vtkCirclePackToPolyData.h | 2 + Infovis/Layout/vtkCircularLayoutStrategy.cxx | 2 + Infovis/Layout/vtkCircularLayoutStrategy.h | 2 + .../Layout/vtkClustering2DLayoutStrategy.cxx | 2 + .../Layout/vtkClustering2DLayoutStrategy.h | 2 + .../Layout/vtkCommunity2DLayoutStrategy.cxx | 2 + Infovis/Layout/vtkCommunity2DLayoutStrategy.h | 2 + Infovis/Layout/vtkConeLayoutStrategy.cxx | 2 + Infovis/Layout/vtkConeLayoutStrategy.h | 2 + .../Layout/vtkConstrained2DLayoutStrategy.cxx | 2 + .../Layout/vtkConstrained2DLayoutStrategy.h | 2 + .../Layout/vtkCosmicTreeLayoutStrategy.cxx | 2 + Infovis/Layout/vtkCosmicTreeLayoutStrategy.h | 2 + Infovis/Layout/vtkEdgeLayout.cxx | 2 + Infovis/Layout/vtkEdgeLayout.h | 2 + Infovis/Layout/vtkEdgeLayoutStrategy.cxx | 2 + Infovis/Layout/vtkEdgeLayoutStrategy.h | 2 + Infovis/Layout/vtkFast2DLayoutStrategy.cxx | 2 + Infovis/Layout/vtkFast2DLayoutStrategy.h | 2 + .../Layout/vtkForceDirectedLayoutStrategy.cxx | 2 + .../Layout/vtkForceDirectedLayoutStrategy.h | 2 + Infovis/Layout/vtkGeoEdgeStrategy.cxx | 2 + Infovis/Layout/vtkGeoEdgeStrategy.h | 2 + Infovis/Layout/vtkGeoMath.cxx | 2 + Infovis/Layout/vtkGeoMath.h | 2 + Infovis/Layout/vtkGraphLayout.cxx | 2 + Infovis/Layout/vtkGraphLayout.h | 2 + Infovis/Layout/vtkGraphLayoutStrategy.cxx | 2 + Infovis/Layout/vtkGraphLayoutStrategy.h | 2 + Infovis/Layout/vtkIncrementalForceLayout.cxx | 2 + Infovis/Layout/vtkIncrementalForceLayout.h | 2 + Infovis/Layout/vtkKCoreLayout.cxx | 2 + Infovis/Layout/vtkKCoreLayout.h | 2 + Infovis/Layout/vtkPassThroughEdgeStrategy.cxx | 2 + Infovis/Layout/vtkPassThroughEdgeStrategy.h | 2 + .../Layout/vtkPassThroughLayoutStrategy.cxx | 2 + Infovis/Layout/vtkPassThroughLayoutStrategy.h | 2 + .../Layout/vtkPerturbCoincidentVertices.cxx | 2 + Infovis/Layout/vtkPerturbCoincidentVertices.h | 2 + Infovis/Layout/vtkRandomLayoutStrategy.cxx | 2 + Infovis/Layout/vtkRandomLayoutStrategy.h | 2 + Infovis/Layout/vtkSimple2DLayoutStrategy.cxx | 2 + Infovis/Layout/vtkSimple2DLayoutStrategy.h | 2 + Infovis/Layout/vtkSimple3DCirclesStrategy.cxx | 2 + Infovis/Layout/vtkSimple3DCirclesStrategy.h | 2 + .../Layout/vtkSliceAndDiceLayoutStrategy.cxx | 2 + .../Layout/vtkSliceAndDiceLayoutStrategy.h | 2 + Infovis/Layout/vtkSpanTreeLayoutStrategy.cxx | 2 + Infovis/Layout/vtkSpanTreeLayoutStrategy.h | 2 + Infovis/Layout/vtkSplineGraphEdges.cxx | 2 + Infovis/Layout/vtkSplineGraphEdges.h | 2 + Infovis/Layout/vtkSquarifyLayoutStrategy.cxx | 2 + Infovis/Layout/vtkSquarifyLayoutStrategy.h | 2 + .../Layout/vtkStackedTreeLayoutStrategy.cxx | 2 + Infovis/Layout/vtkStackedTreeLayoutStrategy.h | 2 + Infovis/Layout/vtkTreeLayoutStrategy.cxx | 2 + Infovis/Layout/vtkTreeLayoutStrategy.h | 2 + Infovis/Layout/vtkTreeMapLayout.cxx | 2 + Infovis/Layout/vtkTreeMapLayout.h | 2 + Infovis/Layout/vtkTreeMapLayoutStrategy.cxx | 2 + Infovis/Layout/vtkTreeMapLayoutStrategy.h | 2 + Infovis/Layout/vtkTreeMapToPolyData.cxx | 2 + Infovis/Layout/vtkTreeMapToPolyData.h | 2 + Infovis/Layout/vtkTreeOrbitLayoutStrategy.cxx | 2 + Infovis/Layout/vtkTreeOrbitLayoutStrategy.h | 2 + Infovis/Layout/vtkTreeRingToPolyData.cxx | 2 + Infovis/Layout/vtkTreeRingToPolyData.h | 2 + Interaction/Image/vtkImageViewer.cxx | 2 + Interaction/Image/vtkImageViewer.h | 2 + Interaction/Image/vtkImageViewer2.cxx | 2 + Interaction/Image/vtkImageViewer2.h | 2 + Interaction/Image/vtkResliceImageViewer.cxx | 2 + Interaction/Image/vtkResliceImageViewer.h | 2 + .../vtkResliceImageViewerMeasurements.cxx | 2 + .../Image/vtkResliceImageViewerMeasurements.h | 2 + .../Style/vtkInteractorStyleDrawPolygon.cxx | 2 + .../Style/vtkInteractorStyleDrawPolygon.h | 2 + .../Style/vtkInteractorStyleFlight.cxx | 2 + Interaction/Style/vtkInteractorStyleFlight.h | 2 + Interaction/Style/vtkInteractorStyleImage.cxx | 2 + Interaction/Style/vtkInteractorStyleImage.h | 2 + .../Style/vtkInteractorStyleJoystickActor.cxx | 2 + .../Style/vtkInteractorStyleJoystickActor.h | 2 + .../vtkInteractorStyleJoystickCamera.cxx | 2 + .../Style/vtkInteractorStyleJoystickCamera.h | 2 + .../vtkInteractorStyleMultiTouchCamera.cxx | 2 + .../vtkInteractorStyleMultiTouchCamera.h | 2 + .../Style/vtkInteractorStyleRubberBand2D.cxx | 2 + .../Style/vtkInteractorStyleRubberBand2D.h | 2 + .../Style/vtkInteractorStyleRubberBand3D.cxx | 2 + .../Style/vtkInteractorStyleRubberBand3D.h | 2 + .../vtkInteractorStyleRubberBandPick.cxx | 2 + .../Style/vtkInteractorStyleRubberBandPick.h | 2 + .../vtkInteractorStyleRubberBandZoom.cxx | 2 + .../Style/vtkInteractorStyleRubberBandZoom.h | 2 + .../Style/vtkInteractorStyleSwitch.cxx | 2 + Interaction/Style/vtkInteractorStyleSwitch.h | 2 + .../Style/vtkInteractorStyleTerrain.cxx | 2 + Interaction/Style/vtkInteractorStyleTerrain.h | 2 + .../Style/vtkInteractorStyleTrackball.cxx | 2 + .../Style/vtkInteractorStyleTrackball.h | 2 + .../vtkInteractorStyleTrackballActor.cxx | 2 + .../Style/vtkInteractorStyleTrackballActor.h | 2 + .../vtkInteractorStyleTrackballCamera.cxx | 2 + .../Style/vtkInteractorStyleTrackballCamera.h | 2 + .../Style/vtkInteractorStyleUnicam.cxx | 6 + Interaction/Style/vtkInteractorStyleUnicam.h | 2 + Interaction/Style/vtkInteractorStyleUser.cxx | 2 + Interaction/Style/vtkInteractorStyleUser.h | 2 + .../vtkParallelCoordinatesInteractorStyle.cxx | 2 + .../vtkParallelCoordinatesInteractorStyle.h | 2 + Interaction/Widgets/vtk3DWidget.cxx | 2 + Interaction/Widgets/vtk3DWidget.h | 2 + ...bstractPolygonalHandleRepresentation3D.cxx | 2 + ...kAbstractPolygonalHandleRepresentation3D.h | 2 + .../vtkAbstractSplineRepresentation.cxx | 2 + .../Widgets/vtkAbstractSplineRepresentation.h | 2 + Interaction/Widgets/vtkAbstractWidget.cxx | 2 + Interaction/Widgets/vtkAbstractWidget.h | 2 + .../Widgets/vtkAffineRepresentation.cxx | 2 + Interaction/Widgets/vtkAffineRepresentation.h | 2 + .../Widgets/vtkAffineRepresentation2D.cxx | 2 + .../Widgets/vtkAffineRepresentation2D.h | 2 + Interaction/Widgets/vtkAffineWidget.cxx | 2 + Interaction/Widgets/vtkAffineWidget.h | 2 + .../Widgets/vtkAngleRepresentation.cxx | 2 + Interaction/Widgets/vtkAngleRepresentation.h | 2 + .../Widgets/vtkAngleRepresentation2D.cxx | 2 + .../Widgets/vtkAngleRepresentation2D.h | 2 + .../Widgets/vtkAngleRepresentation3D.cxx | 2 + .../Widgets/vtkAngleRepresentation3D.h | 2 + Interaction/Widgets/vtkAngleWidget.cxx | 2 + Interaction/Widgets/vtkAngleWidget.h | 2 + .../vtkAxesTransformRepresentation.cxx | 2 + .../Widgets/vtkAxesTransformRepresentation.h | 2 + .../Widgets/vtkAxesTransformWidget.cxx | 2 + Interaction/Widgets/vtkAxesTransformWidget.h | 2 + .../Widgets/vtkBalloonRepresentation.cxx | 2 + .../Widgets/vtkBalloonRepresentation.h | 2 + Interaction/Widgets/vtkBalloonWidget.cxx | 2 + Interaction/Widgets/vtkBalloonWidget.h | 2 + .../vtkBezierContourLineInterpolator.cxx | 2 + .../vtkBezierContourLineInterpolator.h | 2 + .../vtkBiDimensionalRepresentation.cxx | 2 + .../Widgets/vtkBiDimensionalRepresentation.h | 2 + .../vtkBiDimensionalRepresentation2D.cxx | 2 + .../vtkBiDimensionalRepresentation2D.h | 2 + .../Widgets/vtkBiDimensionalWidget.cxx | 2 + Interaction/Widgets/vtkBiDimensionalWidget.h | 2 + .../Widgets/vtkBorderRepresentation.cxx | 2 + Interaction/Widgets/vtkBorderRepresentation.h | 2 + Interaction/Widgets/vtkBorderWidget.cxx | 2 + Interaction/Widgets/vtkBorderWidget.h | 2 + .../Widgets/vtkBoundedPlanePointPlacer.cxx | 2 + .../Widgets/vtkBoundedPlanePointPlacer.h | 2 + Interaction/Widgets/vtkBoxRepresentation.cxx | 2 + Interaction/Widgets/vtkBoxRepresentation.h | 2 + Interaction/Widgets/vtkBoxWidget.cxx | 2 + Interaction/Widgets/vtkBoxWidget.h | 2 + Interaction/Widgets/vtkBoxWidget2.cxx | 2 + Interaction/Widgets/vtkBoxWidget2.h | 2 + Interaction/Widgets/vtkBrokenLineWidget.cxx | 2 + Interaction/Widgets/vtkBrokenLineWidget.h | 2 + .../Widgets/vtkButtonRepresentation.cxx | 2 + Interaction/Widgets/vtkButtonRepresentation.h | 2 + Interaction/Widgets/vtkButtonWidget.cxx | 2 + Interaction/Widgets/vtkButtonWidget.h | 2 + Interaction/Widgets/vtkCameraHandleSource.cxx | 2 + Interaction/Widgets/vtkCameraHandleSource.h | 2 + .../vtkCameraOrientationRepresentation.cxx | 2 + .../vtkCameraOrientationRepresentation.h | 2 + .../Widgets/vtkCameraOrientationWidget.cxx | 2 + .../Widgets/vtkCameraOrientationWidget.h | 2 + .../Widgets/vtkCameraPathRepresentation.cxx | 2 + .../Widgets/vtkCameraPathRepresentation.h | 2 + Interaction/Widgets/vtkCameraPathWidget.cxx | 2 + Interaction/Widgets/vtkCameraPathWidget.h | 2 + .../Widgets/vtkCameraRepresentation.cxx | 2 + Interaction/Widgets/vtkCameraRepresentation.h | 2 + Interaction/Widgets/vtkCameraWidget.cxx | 2 + Interaction/Widgets/vtkCameraWidget.h | 2 + .../Widgets/vtkCaptionRepresentation.cxx | 2 + .../Widgets/vtkCaptionRepresentation.h | 2 + Interaction/Widgets/vtkCaptionWidget.cxx | 2 + Interaction/Widgets/vtkCaptionWidget.h | 2 + .../Widgets/vtkCellCentersPointPlacer.cxx | 2 + .../Widgets/vtkCellCentersPointPlacer.h | 2 + .../vtkCenteredSliderRepresentation.cxx | 2 + .../Widgets/vtkCenteredSliderRepresentation.h | 2 + .../Widgets/vtkCenteredSliderWidget.cxx | 2 + Interaction/Widgets/vtkCenteredSliderWidget.h | 2 + .../Widgets/vtkCheckerboardRepresentation.cxx | 2 + .../Widgets/vtkCheckerboardRepresentation.h | 2 + Interaction/Widgets/vtkCheckerboardWidget.cxx | 2 + Interaction/Widgets/vtkCheckerboardWidget.h | 2 + .../Widgets/vtkClosedSurfacePointPlacer.cxx | 2 + .../Widgets/vtkClosedSurfacePointPlacer.h | 2 + .../Widgets/vtkCompassRepresentation.cxx | 2 + .../Widgets/vtkCompassRepresentation.h | 2 + Interaction/Widgets/vtkCompassWidget.cxx | 2 + Interaction/Widgets/vtkCompassWidget.h | 2 + ...tkConstrainedPointHandleRepresentation.cxx | 2 + .../vtkConstrainedPointHandleRepresentation.h | 2 + .../Widgets/vtkContinuousValueWidget.cxx | 2 + .../Widgets/vtkContinuousValueWidget.h | 2 + ...vtkContinuousValueWidgetRepresentation.cxx | 2 + .../vtkContinuousValueWidgetRepresentation.h | 2 + .../Widgets/vtkContourLineInterpolator.cxx | 2 + .../Widgets/vtkContourLineInterpolator.h | 2 + .../Widgets/vtkContourRepresentation.cxx | 2 + .../Widgets/vtkContourRepresentation.h | 2 + Interaction/Widgets/vtkContourWidget.cxx | 2 + Interaction/Widgets/vtkContourWidget.h | 2 + .../vtkCoordinateFrameRepresentation.cxx | 2 + .../vtkCoordinateFrameRepresentation.h | 2 + .../Widgets/vtkCoordinateFrameWidget.cxx | 2 + .../Widgets/vtkCoordinateFrameWidget.h | 2 + .../Widgets/vtkCurveRepresentation.cxx | 2 + Interaction/Widgets/vtkCurveRepresentation.h | 2 + ...tkDijkstraImageContourLineInterpolator.cxx | 2 + .../vtkDijkstraImageContourLineInterpolator.h | 2 + ...isplaySizedImplicitPlaneRepresentation.cxx | 2 + ...kDisplaySizedImplicitPlaneRepresentation.h | 2 + .../vtkDisplaySizedImplicitPlaneWidget.cxx | 2 + .../vtkDisplaySizedImplicitPlaneWidget.h | 2 + .../Widgets/vtkDistanceRepresentation.cxx | 2 + .../Widgets/vtkDistanceRepresentation.h | 2 + .../Widgets/vtkDistanceRepresentation2D.cxx | 2 + .../Widgets/vtkDistanceRepresentation2D.h | 2 + .../Widgets/vtkDistanceRepresentation3D.cxx | 2 + .../Widgets/vtkDistanceRepresentation3D.h | 2 + Interaction/Widgets/vtkDistanceWidget.cxx | 2 + Interaction/Widgets/vtkDistanceWidget.h | 2 + .../vtkEllipsoidTensorProbeRepresentation.cxx | 2 + .../vtkEllipsoidTensorProbeRepresentation.h | 2 + .../Widgets/vtkEqualizerContextItem.cxx | 4 + Interaction/Widgets/vtkEqualizerContextItem.h | 2 + Interaction/Widgets/vtkEvent.cxx | 2 + Interaction/Widgets/vtkEvent.h | 2 + .../Widgets/vtkFinitePlaneRepresentation.cxx | 2 + .../Widgets/vtkFinitePlaneRepresentation.h | 2 + Interaction/Widgets/vtkFinitePlaneWidget.cxx | 2 + Interaction/Widgets/vtkFinitePlaneWidget.h | 2 + .../vtkFixedSizeHandleRepresentation3D.cxx | 2 + .../vtkFixedSizeHandleRepresentation3D.h | 2 + .../vtkFocalPlaneContourRepresentation.cxx | 2 + .../vtkFocalPlaneContourRepresentation.h | 2 + .../Widgets/vtkFocalPlanePointPlacer.cxx | 2 + .../Widgets/vtkFocalPlanePointPlacer.h | 2 + .../Widgets/vtkHandleRepresentation.cxx | 2 + Interaction/Widgets/vtkHandleRepresentation.h | 2 + Interaction/Widgets/vtkHandleWidget.cxx | 2 + Interaction/Widgets/vtkHandleWidget.h | 2 + Interaction/Widgets/vtkHoverWidget.cxx | 2 + Interaction/Widgets/vtkHoverWidget.h | 2 + .../Widgets/vtkImageActorPointPlacer.cxx | 2 + .../Widgets/vtkImageActorPointPlacer.h | 2 + .../Widgets/vtkImageCroppingRegionsWidget.cxx | 2 + .../Widgets/vtkImageCroppingRegionsWidget.h | 2 + Interaction/Widgets/vtkImageOrthoPlanes.cxx | 2 + Interaction/Widgets/vtkImageOrthoPlanes.h | 2 + Interaction/Widgets/vtkImagePlaneWidget.cxx | 2 + Interaction/Widgets/vtkImagePlaneWidget.h | 2 + Interaction/Widgets/vtkImageTracerWidget.cxx | 2 + Interaction/Widgets/vtkImageTracerWidget.h | 2 + .../vtkImplicitCylinderRepresentation.cxx | 2 + .../vtkImplicitCylinderRepresentation.h | 2 + .../Widgets/vtkImplicitCylinderWidget.cxx | 2 + .../Widgets/vtkImplicitCylinderWidget.h | 2 + .../vtkImplicitImageRepresentation.cxx | 2 + .../Widgets/vtkImplicitImageRepresentation.h | 2 + .../vtkImplicitPlaneRepresentation.cxx | 2 + .../Widgets/vtkImplicitPlaneRepresentation.h | 2 + .../Widgets/vtkImplicitPlaneWidget.cxx | 2 + Interaction/Widgets/vtkImplicitPlaneWidget.h | 2 + .../Widgets/vtkImplicitPlaneWidget2.cxx | 2 + Interaction/Widgets/vtkImplicitPlaneWidget2.h | 2 + .../Widgets/vtkLightRepresentation.cxx | 2 + Interaction/Widgets/vtkLightRepresentation.h | 2 + Interaction/Widgets/vtkLightWidget.cxx | 2 + Interaction/Widgets/vtkLightWidget.h | 2 + Interaction/Widgets/vtkLineRepresentation.cxx | 2 + Interaction/Widgets/vtkLineRepresentation.h | 2 + Interaction/Widgets/vtkLineWidget.cxx | 2 + Interaction/Widgets/vtkLineWidget.h | 2 + Interaction/Widgets/vtkLineWidget2.cxx | 2 + Interaction/Widgets/vtkLineWidget2.h | 2 + .../vtkLinearContourLineInterpolator.cxx | 2 + .../vtkLinearContourLineInterpolator.h | 2 + Interaction/Widgets/vtkLogoRepresentation.cxx | 2 + Interaction/Widgets/vtkLogoRepresentation.h | 2 + Interaction/Widgets/vtkLogoWidget.cxx | 2 + Interaction/Widgets/vtkLogoWidget.h | 2 + .../Widgets/vtkMagnifierRepresentation.cxx | 2 + .../Widgets/vtkMagnifierRepresentation.h | 2 + Interaction/Widgets/vtkMagnifierWidget.cxx | 2 + Interaction/Widgets/vtkMagnifierWidget.h | 2 + ...kMeasurementCubeHandleRepresentation3D.cxx | 2 + ...vtkMeasurementCubeHandleRepresentation3D.h | 2 + .../Widgets/vtkOrientationMarkerWidget.cxx | 2 + .../Widgets/vtkOrientationMarkerWidget.h | 2 + .../vtkOrientedGlyphContourRepresentation.cxx | 2 + .../vtkOrientedGlyphContourRepresentation.h | 2 + ...edGlyphFocalPlaneContourRepresentation.cxx | 2 + ...ntedGlyphFocalPlaneContourRepresentation.h | 2 + ...rientedPolygonalHandleRepresentation3D.cxx | 2 + ...kOrientedPolygonalHandleRepresentation3D.h | 2 + .../vtkParallelopipedRepresentation.cxx | 2 + .../Widgets/vtkParallelopipedRepresentation.h | 2 + .../Widgets/vtkParallelopipedWidget.cxx | 2 + Interaction/Widgets/vtkParallelopipedWidget.h | 2 + Interaction/Widgets/vtkPlaneWidget.cxx | 2 + Interaction/Widgets/vtkPlaneWidget.h | 2 + .../Widgets/vtkPlaybackRepresentation.cxx | 2 + .../Widgets/vtkPlaybackRepresentation.h | 2 + Interaction/Widgets/vtkPlaybackWidget.cxx | 2 + Interaction/Widgets/vtkPlaybackWidget.h | 2 + .../Widgets/vtkPointCloudRepresentation.cxx | 2 + .../Widgets/vtkPointCloudRepresentation.h | 2 + Interaction/Widgets/vtkPointCloudWidget.cxx | 2 + Interaction/Widgets/vtkPointCloudWidget.h | 2 + .../vtkPointHandleRepresentation2D.cxx | 2 + .../Widgets/vtkPointHandleRepresentation2D.h | 2 + .../vtkPointHandleRepresentation3D.cxx | 2 + .../Widgets/vtkPointHandleRepresentation3D.h | 2 + Interaction/Widgets/vtkPointPlacer.cxx | 2 + Interaction/Widgets/vtkPointPlacer.h | 2 + Interaction/Widgets/vtkPointWidget.cxx | 2 + Interaction/Widgets/vtkPointWidget.h | 2 + .../vtkPolyDataContourLineInterpolator.cxx | 2 + .../vtkPolyDataContourLineInterpolator.h | 2 + .../Widgets/vtkPolyDataPointPlacer.cxx | 2 + Interaction/Widgets/vtkPolyDataPointPlacer.h | 2 + .../Widgets/vtkPolyDataSourceWidget.cxx | 2 + Interaction/Widgets/vtkPolyDataSourceWidget.h | 2 + .../Widgets/vtkPolyLineRepresentation.cxx | 2 + .../Widgets/vtkPolyLineRepresentation.h | 2 + Interaction/Widgets/vtkPolyLineWidget.cxx | 2 + Interaction/Widgets/vtkPolyLineWidget.h | 2 + .../vtkPolygonalHandleRepresentation3D.cxx | 2 + .../vtkPolygonalHandleRepresentation3D.h | 2 + ...olygonalSurfaceContourLineInterpolator.cxx | 2 + ...kPolygonalSurfaceContourLineInterpolator.h | 2 + .../vtkPolygonalSurfacePointPlacer.cxx | 2 + .../Widgets/vtkPolygonalSurfacePointPlacer.h | 2 + .../Widgets/vtkProgressBarRepresentation.cxx | 2 + .../Widgets/vtkProgressBarRepresentation.h | 2 + Interaction/Widgets/vtkProgressBarWidget.cxx | 2 + Interaction/Widgets/vtkProgressBarWidget.h | 2 + .../Widgets/vtkProp3DButtonRepresentation.cxx | 2 + .../Widgets/vtkProp3DButtonRepresentation.h | 2 + .../vtkRectilinearWipeRepresentation.cxx | 2 + .../vtkRectilinearWipeRepresentation.h | 2 + .../Widgets/vtkRectilinearWipeWidget.cxx | 2 + .../Widgets/vtkRectilinearWipeWidget.h | 2 + Interaction/Widgets/vtkResliceCursor.cxx | 2 + Interaction/Widgets/vtkResliceCursor.h | 2 + Interaction/Widgets/vtkResliceCursorActor.cxx | 2 + Interaction/Widgets/vtkResliceCursorActor.h | 2 + .../vtkResliceCursorLineRepresentation.cxx | 2 + .../vtkResliceCursorLineRepresentation.h | 2 + .../Widgets/vtkResliceCursorPicker.cxx | 2 + Interaction/Widgets/vtkResliceCursorPicker.h | 2 + .../vtkResliceCursorPolyDataAlgorithm.cxx | 2 + .../vtkResliceCursorPolyDataAlgorithm.h | 2 + .../vtkResliceCursorRepresentation.cxx | 2 + .../Widgets/vtkResliceCursorRepresentation.h | 2 + ...tkResliceCursorThickLineRepresentation.cxx | 2 + .../vtkResliceCursorThickLineRepresentation.h | 2 + .../Widgets/vtkResliceCursorWidget.cxx | 2 + Interaction/Widgets/vtkResliceCursorWidget.h | 2 + .../Widgets/vtkScalarBarRepresentation.cxx | 2 + .../Widgets/vtkScalarBarRepresentation.h | 2 + Interaction/Widgets/vtkScalarBarWidget.cxx | 2 + Interaction/Widgets/vtkScalarBarWidget.h | 2 + Interaction/Widgets/vtkSeedRepresentation.cxx | 2 + Interaction/Widgets/vtkSeedRepresentation.h | 2 + Interaction/Widgets/vtkSeedWidget.cxx | 2 + Interaction/Widgets/vtkSeedWidget.h | 2 + .../Widgets/vtkSliderRepresentation.cxx | 2 + Interaction/Widgets/vtkSliderRepresentation.h | 2 + .../Widgets/vtkSliderRepresentation2D.cxx | 2 + .../Widgets/vtkSliderRepresentation2D.h | 2 + .../Widgets/vtkSliderRepresentation3D.cxx | 2 + .../Widgets/vtkSliderRepresentation3D.h | 2 + Interaction/Widgets/vtkSliderWidget.cxx | 2 + Interaction/Widgets/vtkSliderWidget.h | 2 + .../Widgets/vtkSphereHandleRepresentation.cxx | 2 + .../Widgets/vtkSphereHandleRepresentation.h | 2 + .../Widgets/vtkSphereRepresentation.cxx | 2 + Interaction/Widgets/vtkSphereRepresentation.h | 2 + Interaction/Widgets/vtkSphereWidget.cxx | 2 + Interaction/Widgets/vtkSphereWidget.h | 2 + Interaction/Widgets/vtkSphereWidget2.cxx | 2 + Interaction/Widgets/vtkSphereWidget2.h | 2 + .../Widgets/vtkSplineRepresentation.cxx | 2 + Interaction/Widgets/vtkSplineRepresentation.h | 2 + Interaction/Widgets/vtkSplineWidget.cxx | 2 + Interaction/Widgets/vtkSplineWidget.h | 2 + Interaction/Widgets/vtkSplineWidget2.cxx | 2 + Interaction/Widgets/vtkSplineWidget2.h | 2 + .../Widgets/vtkTensorProbeRepresentation.cxx | 2 + .../Widgets/vtkTensorProbeRepresentation.h | 2 + Interaction/Widgets/vtkTensorProbeWidget.cxx | 2 + Interaction/Widgets/vtkTensorProbeWidget.h | 2 + .../Widgets/vtkTensorRepresentation.cxx | 2 + Interaction/Widgets/vtkTensorRepresentation.h | 2 + Interaction/Widgets/vtkTensorWidget.cxx | 2 + Interaction/Widgets/vtkTensorWidget.h | 2 + .../vtkTerrainContourLineInterpolator.cxx | 2 + .../vtkTerrainContourLineInterpolator.h | 2 + .../Widgets/vtkTerrainDataPointPlacer.cxx | 2 + .../Widgets/vtkTerrainDataPointPlacer.h | 2 + Interaction/Widgets/vtkTextRepresentation.cxx | 2 + Interaction/Widgets/vtkTextRepresentation.h | 2 + Interaction/Widgets/vtkTextWidget.cxx | 2 + Interaction/Widgets/vtkTextWidget.h | 8 +- .../vtkTexturedButtonRepresentation.cxx | 2 + .../Widgets/vtkTexturedButtonRepresentation.h | 2 + .../vtkTexturedButtonRepresentation2D.cxx | 2 + .../vtkTexturedButtonRepresentation2D.h | 2 + .../Widgets/vtkWidgetCallbackMapper.cxx | 2 + Interaction/Widgets/vtkWidgetCallbackMapper.h | 2 + Interaction/Widgets/vtkWidgetEvent.cxx | 2 + Interaction/Widgets/vtkWidgetEvent.h | 2 + .../Widgets/vtkWidgetEventTranslator.cxx | 2 + .../Widgets/vtkWidgetEventTranslator.h | 2 + .../Widgets/vtkWidgetRepresentation.cxx | 2 + Interaction/Widgets/vtkWidgetRepresentation.h | 2 + Interaction/Widgets/vtkWidgetSet.cxx | 2 + Interaction/Widgets/vtkWidgetSet.h | 2 + .../Widgets/vtkXYPlotRepresentation.cxx | 2 + Interaction/Widgets/vtkXYPlotRepresentation.h | 2 + Interaction/Widgets/vtkXYPlotWidget.cxx | 2 + Interaction/Widgets/vtkXYPlotWidget.h | 2 + Parallel/Core/vtkCommunicator.cxx | 2 + Parallel/Core/vtkCommunicator.h | 2 + Parallel/Core/vtkDummyCommunicator.cxx | 2 + Parallel/Core/vtkDummyCommunicator.h | 2 + Parallel/Core/vtkDummyController.cxx | 2 + Parallel/Core/vtkDummyController.h | 2 + Parallel/Core/vtkFieldDataSerializer.cxx | 2 + Parallel/Core/vtkFieldDataSerializer.h | 2 + Parallel/Core/vtkMultiProcessController.cxx | 2 + Parallel/Core/vtkMultiProcessController.h | 2 + Parallel/Core/vtkMultiProcessStream.cxx | 2 + Parallel/Core/vtkMultiProcessStream.h | 2 + .../Core/vtkMultiProcessStreamSerialization.h | 2 + Parallel/Core/vtkPDirectory.cxx | 2 + Parallel/Core/vtkPDirectory.h | 2 + Parallel/Core/vtkPSystemTools.cxx | 2 + Parallel/Core/vtkPSystemTools.h | 2 + Parallel/Core/vtkProcess.cxx | 2 + Parallel/Core/vtkProcess.h | 2 + Parallel/Core/vtkProcessGroup.cxx | 2 + Parallel/Core/vtkProcessGroup.h | 2 + Parallel/Core/vtkSocketCommunicator.cxx | 4 + Parallel/Core/vtkSocketCommunicator.h | 2 + Parallel/Core/vtkSocketController.cxx | 2 + Parallel/Core/vtkSocketController.h | 2 + Parallel/Core/vtkSubCommunicator.cxx | 2 + Parallel/Core/vtkSubCommunicator.h | 2 + Parallel/Core/vtkSubGroup.cxx | 2 + Parallel/Core/vtkSubGroup.h | 2 + Parallel/Core/vtkThreadedTaskQueue.h | 7 +- Parallel/Core/vtkThreadedTaskQueue.txx | 4 + Parallel/DIY/vtkDIYDataExchanger.cxx | 2 + Parallel/DIY/vtkDIYDataExchanger.h | 2 + Parallel/DIY/vtkDIYExplicitAssigner.cxx | 2 + Parallel/DIY/vtkDIYExplicitAssigner.h | 2 + Parallel/DIY/vtkDIYGhostUtilities.cxx | 3 + Parallel/DIY/vtkDIYGhostUtilities.h | 2 + Parallel/DIY/vtkDIYGhostUtilities.txx | 7 + Parallel/DIY/vtkDIYUtilities.cxx | 2 + Parallel/DIY/vtkDIYUtilities.h | 4 + Parallel/DIY/vtkDIYUtilities.txx | 2 + .../Cxx/ExerciseMultiProcessController.h | 4 + Parallel/MPI/vtkMPI.h | 2 + Parallel/MPI/vtkMPICommunicator.cxx | 2 + Parallel/MPI/vtkMPICommunicator.h | 2 + Parallel/MPI/vtkMPIController.cxx | 2 + Parallel/MPI/vtkMPIController.h | 2 + Parallel/MPI/vtkMPIEventLog.cxx | 2 + Parallel/MPI/vtkMPIEventLog.h | 2 + Parallel/MPI/vtkMPIUtilities.cxx | 2 + Parallel/MPI/vtkMPIUtilities.h | 4 + Parallel/MPI4Py/vtkMPI4PyCommunicator.cxx | 2 + Parallel/MPI4Py/vtkMPI4PyCommunicator.h | 2 + .../Annotation/vtkAnnotatedCubeActor.cxx | 2 + Rendering/Annotation/vtkAnnotatedCubeActor.h | 2 + Rendering/Annotation/vtkArcPlotter.cxx | 2 + Rendering/Annotation/vtkArcPlotter.h | 2 + Rendering/Annotation/vtkAxesActor.cxx | 2 + Rendering/Annotation/vtkAxesActor.h | 2 + Rendering/Annotation/vtkAxisActor.cxx | 2 + Rendering/Annotation/vtkAxisActor.h | 2 + Rendering/Annotation/vtkAxisActor2D.cxx | 2 + Rendering/Annotation/vtkAxisActor2D.h | 2 + Rendering/Annotation/vtkAxisFollower.cxx | 2 + Rendering/Annotation/vtkAxisFollower.h | 2 + Rendering/Annotation/vtkBarChartActor.cxx | 2 + Rendering/Annotation/vtkBarChartActor.h | 2 + Rendering/Annotation/vtkCaptionActor2D.cxx | 2 + Rendering/Annotation/vtkCaptionActor2D.h | 2 + Rendering/Annotation/vtkConvexHull2D.cxx | 2 + Rendering/Annotation/vtkConvexHull2D.h | 2 + Rendering/Annotation/vtkCornerAnnotation.cxx | 2 + Rendering/Annotation/vtkCornerAnnotation.h | 2 + Rendering/Annotation/vtkCubeAxesActor.cxx | 2 + Rendering/Annotation/vtkCubeAxesActor.h | 2 + Rendering/Annotation/vtkCubeAxesActor2D.cxx | 2 + Rendering/Annotation/vtkCubeAxesActor2D.h | 2 + .../vtkGraphAnnotationLayersFilter.cxx | 2 + .../vtkGraphAnnotationLayersFilter.h | 2 + Rendering/Annotation/vtkLeaderActor2D.cxx | 2 + Rendering/Annotation/vtkLeaderActor2D.h | 2 + Rendering/Annotation/vtkLegendBoxActor.cxx | 2 + Rendering/Annotation/vtkLegendBoxActor.h | 2 + Rendering/Annotation/vtkLegendScaleActor.cxx | 2 + Rendering/Annotation/vtkLegendScaleActor.h | 2 + .../vtkParallelCoordinatesActor.cxx | 2 + .../Annotation/vtkParallelCoordinatesActor.h | 2 + Rendering/Annotation/vtkPieChartActor.cxx | 2 + Rendering/Annotation/vtkPieChartActor.h | 2 + Rendering/Annotation/vtkPolarAxesActor.cxx | 2 + Rendering/Annotation/vtkPolarAxesActor.h | 2 + .../Annotation/vtkProp3DAxisFollower.cxx | 2 + Rendering/Annotation/vtkProp3DAxisFollower.h | 2 + Rendering/Annotation/vtkScalarBarActor.cxx | 2 + Rendering/Annotation/vtkScalarBarActor.h | 2 + .../Annotation/vtkScalarBarActorInternal.h | 2 + Rendering/Annotation/vtkSpiderPlotActor.cxx | 2 + Rendering/Annotation/vtkSpiderPlotActor.h | 2 + Rendering/Annotation/vtkXYPlotActor.cxx | 2 + Rendering/Annotation/vtkXYPlotActor.h | 2 + .../Context2D/vtkAbstractContextBufferId.cxx | 2 + .../Context2D/vtkAbstractContextBufferId.h | 2 + .../Context2D/vtkAbstractContextItem.cxx | 2 + Rendering/Context2D/vtkAbstractContextItem.h | 2 + Rendering/Context2D/vtkBlockItem.cxx | 2 + Rendering/Context2D/vtkBlockItem.h | 2 + Rendering/Context2D/vtkBrush.cxx | 2 + Rendering/Context2D/vtkBrush.h | 2 + Rendering/Context2D/vtkContext2D.cxx | 2 + Rendering/Context2D/vtkContext2D.h | 2 + Rendering/Context2D/vtkContext3D.cxx | 2 + Rendering/Context2D/vtkContext3D.h | 2 + Rendering/Context2D/vtkContextActor.cxx | 2 + Rendering/Context2D/vtkContextActor.h | 2 + Rendering/Context2D/vtkContextClip.cxx | 2 + Rendering/Context2D/vtkContextClip.h | 2 + Rendering/Context2D/vtkContextDevice2D.cxx | 2 + Rendering/Context2D/vtkContextDevice2D.h | 2 + Rendering/Context2D/vtkContextDevice3D.cxx | 2 + Rendering/Context2D/vtkContextDevice3D.h | 2 + Rendering/Context2D/vtkContextItem.cxx | 2 + Rendering/Context2D/vtkContextItem.h | 2 + Rendering/Context2D/vtkContextKeyEvent.cxx | 2 + Rendering/Context2D/vtkContextKeyEvent.h | 2 + Rendering/Context2D/vtkContextMapper2D.cxx | 2 + Rendering/Context2D/vtkContextMapper2D.h | 2 + Rendering/Context2D/vtkContextMouseEvent.cxx | 2 + Rendering/Context2D/vtkContextMouseEvent.h | 2 + Rendering/Context2D/vtkContextScene.cxx | 2 + Rendering/Context2D/vtkContextScene.h | 2 + Rendering/Context2D/vtkContextScenePrivate.h | 2 + Rendering/Context2D/vtkContextTransform.cxx | 2 + Rendering/Context2D/vtkContextTransform.h | 2 + Rendering/Context2D/vtkImageItem.cxx | 2 + Rendering/Context2D/vtkImageItem.h | 2 + .../vtkLabeledContourPolyDataItem.cxx | 2 + .../Context2D/vtkLabeledContourPolyDataItem.h | 2 + Rendering/Context2D/vtkMarkerUtilities.cxx | 2 + Rendering/Context2D/vtkMarkerUtilities.h | 2 + Rendering/Context2D/vtkPen.cxx | 2 + Rendering/Context2D/vtkPen.h | 2 + Rendering/Context2D/vtkPolyDataItem.cxx | 2 + Rendering/Context2D/vtkPolyDataItem.h | 2 + Rendering/Context2D/vtkPropItem.cxx | 2 + Rendering/Context2D/vtkPropItem.h | 2 + Rendering/Context2D/vtkTooltipItem.cxx | 2 + Rendering/Context2D/vtkTooltipItem.h | 2 + .../ContextOpenGL2/vtkOpenGLContextActor.cxx | 2 + .../ContextOpenGL2/vtkOpenGLContextActor.h | 2 + .../vtkOpenGLContextBufferId.cxx | 2 + .../ContextOpenGL2/vtkOpenGLContextBufferId.h | 2 + .../vtkOpenGLContextDevice2D.cxx | 2 + .../ContextOpenGL2/vtkOpenGLContextDevice2D.h | 2 + .../vtkOpenGLContextDevice2DPrivate.h | 2 + .../vtkOpenGLContextDevice3D.cxx | 2 + .../ContextOpenGL2/vtkOpenGLContextDevice3D.h | 2 + .../ContextOpenGL2/vtkOpenGLPropItem.cxx | 2 + Rendering/ContextOpenGL2/vtkOpenGLPropItem.h | 2 + .../Core/vtkAbstractHyperTreeGridMapper.cxx | 2 + .../Core/vtkAbstractHyperTreeGridMapper.h | 2 + .../Core/vtkAbstractInteractionDevice.cxx | 2 + Rendering/Core/vtkAbstractInteractionDevice.h | 2 + Rendering/Core/vtkAbstractMapper.cxx | 2 + Rendering/Core/vtkAbstractMapper.h | 2 + Rendering/Core/vtkAbstractMapper3D.cxx | 2 + Rendering/Core/vtkAbstractMapper3D.h | 2 + Rendering/Core/vtkAbstractPicker.cxx | 2 + Rendering/Core/vtkAbstractPicker.h | 2 + Rendering/Core/vtkAbstractPropPicker.cxx | 2 + Rendering/Core/vtkAbstractPropPicker.h | 2 + Rendering/Core/vtkAbstractRenderDevice.cxx | 2 + Rendering/Core/vtkAbstractRenderDevice.h | 2 + Rendering/Core/vtkAbstractVolumeMapper.cxx | 2 + Rendering/Core/vtkAbstractVolumeMapper.h | 2 + Rendering/Core/vtkActor.cxx | 2 + Rendering/Core/vtkActor.h | 2 + Rendering/Core/vtkActor2D.cxx | 2 + Rendering/Core/vtkActor2D.h | 2 + Rendering/Core/vtkActor2DCollection.cxx | 2 + Rendering/Core/vtkActor2DCollection.h | 2 + Rendering/Core/vtkActorCollection.cxx | 2 + Rendering/Core/vtkActorCollection.h | 2 + Rendering/Core/vtkAreaPicker.cxx | 2 + Rendering/Core/vtkAreaPicker.h | 2 + Rendering/Core/vtkAssembly.cxx | 2 + Rendering/Core/vtkAssembly.h | 2 + Rendering/Core/vtkAssemblyNode.cxx | 2 + Rendering/Core/vtkAssemblyNode.h | 2 + Rendering/Core/vtkAssemblyPath.cxx | 2 + Rendering/Core/vtkAssemblyPath.h | 2 + Rendering/Core/vtkAssemblyPaths.cxx | 2 + Rendering/Core/vtkAssemblyPaths.h | 2 + Rendering/Core/vtkAvatar.cxx | 2 + Rendering/Core/vtkAvatar.h | 2 + Rendering/Core/vtkBackgroundColorMonitor.cxx | 2 + Rendering/Core/vtkBackgroundColorMonitor.h | 2 + Rendering/Core/vtkBillboardTextActor3D.cxx | 2 + Rendering/Core/vtkBillboardTextActor3D.h | 2 + Rendering/Core/vtkCIEDE2000.cxx | 2 + Rendering/Core/vtkCIEDE2000.h | 4 + Rendering/Core/vtkCamera.cxx | 2 + Rendering/Core/vtkCamera.h | 2 + Rendering/Core/vtkCameraActor.cxx | 2 + Rendering/Core/vtkCameraActor.h | 2 + Rendering/Core/vtkCameraInterpolator.cxx | 2 + Rendering/Core/vtkCameraInterpolator.h | 2 + Rendering/Core/vtkCellCenterDepthSort.cxx | 2 + Rendering/Core/vtkCellCenterDepthSort.h | 2 + Rendering/Core/vtkCellPicker.cxx | 2 + Rendering/Core/vtkCellPicker.h | 2 + Rendering/Core/vtkColorTransferFunction.cxx | 2 + Rendering/Core/vtkColorTransferFunction.h | 2 + .../vtkCompositeDataDisplayAttributes.cxx | 2 + .../Core/vtkCompositeDataDisplayAttributes.h | 2 + ...tkCompositeDataDisplayAttributesLegacy.cxx | 2 + .../vtkCompositeDataDisplayAttributesLegacy.h | 2 + Rendering/Core/vtkCompositePolyDataMapper.cxx | 2 + Rendering/Core/vtkCompositePolyDataMapper.h | 2 + Rendering/Core/vtkCoordinate.cxx | 2 + Rendering/Core/vtkCoordinate.h | 2 + Rendering/Core/vtkCuller.cxx | 2 + Rendering/Core/vtkCuller.h | 2 + Rendering/Core/vtkCullerCollection.cxx | 2 + Rendering/Core/vtkCullerCollection.h | 2 + Rendering/Core/vtkDataSetMapper.cxx | 2 + Rendering/Core/vtkDataSetMapper.h | 2 + .../vtkDiscretizableColorTransferFunction.cxx | 2 + .../vtkDiscretizableColorTransferFunction.h | 2 + Rendering/Core/vtkDistanceToCamera.cxx | 2 + Rendering/Core/vtkDistanceToCamera.h | 2 + Rendering/Core/vtkFXAAOptions.cxx | 2 + Rendering/Core/vtkFXAAOptions.h | 2 + Rendering/Core/vtkFlagpoleLabel.cxx | 2 + Rendering/Core/vtkFlagpoleLabel.h | 2 + Rendering/Core/vtkFollower.cxx | 2 + Rendering/Core/vtkFollower.h | 2 + Rendering/Core/vtkFrameBufferObjectBase.cxx | 2 + Rendering/Core/vtkFrameBufferObjectBase.h | 2 + Rendering/Core/vtkFrustumCoverageCuller.cxx | 2 + Rendering/Core/vtkFrustumCoverageCuller.h | 2 + Rendering/Core/vtkGPUInfo.cxx | 2 + Rendering/Core/vtkGPUInfo.h | 2 + Rendering/Core/vtkGPUInfoList.cxx | 2 + Rendering/Core/vtkGPUInfoList.h | 2 + Rendering/Core/vtkGPUInfoListArray.h | 2 + .../Core/vtkGenericVertexAttributeMapping.cxx | 2 + .../Core/vtkGenericVertexAttributeMapping.h | 2 + Rendering/Core/vtkGlyph3DMapper.cxx | 2 + Rendering/Core/vtkGlyph3DMapper.h | 2 + Rendering/Core/vtkGraphMapper.cxx | 2 + Rendering/Core/vtkGraphMapper.h | 2 + Rendering/Core/vtkGraphToGlyphs.cxx | 2 + Rendering/Core/vtkGraphToGlyphs.h | 2 + Rendering/Core/vtkGraphicsFactory.cxx | 2 + Rendering/Core/vtkGraphicsFactory.h | 2 + Rendering/Core/vtkHardwarePicker.cxx | 2 + Rendering/Core/vtkHardwarePicker.h | 2 + Rendering/Core/vtkHardwareSelector.cxx | 2 + Rendering/Core/vtkHardwareSelector.h | 2 + Rendering/Core/vtkHardwareWindow.cxx | 2 + Rendering/Core/vtkHardwareWindow.h | 2 + .../Core/vtkHierarchicalPolyDataMapper.cxx | 2 + .../Core/vtkHierarchicalPolyDataMapper.h | 2 + Rendering/Core/vtkImageActor.cxx | 2 + Rendering/Core/vtkImageActor.h | 2 + Rendering/Core/vtkImageMapper.cxx | 2 + Rendering/Core/vtkImageMapper.h | 2 + Rendering/Core/vtkImageMapper3D.cxx | 2 + Rendering/Core/vtkImageMapper3D.h | 2 + Rendering/Core/vtkImageProperty.cxx | 2 + Rendering/Core/vtkImageProperty.h | 2 + Rendering/Core/vtkImageSlice.cxx | 2 + Rendering/Core/vtkImageSlice.h | 2 + Rendering/Core/vtkImageSliceMapper.cxx | 2 + Rendering/Core/vtkImageSliceMapper.h | 2 + Rendering/Core/vtkInteractorEventRecorder.cxx | 2 + Rendering/Core/vtkInteractorEventRecorder.h | 2 + Rendering/Core/vtkInteractorObserver.cxx | 2 + Rendering/Core/vtkInteractorObserver.h | 2 + Rendering/Core/vtkInteractorStyle.cxx | 2 + Rendering/Core/vtkInteractorStyle.h | 2 + Rendering/Core/vtkInteractorStyle3D.cxx | 2 + Rendering/Core/vtkInteractorStyle3D.h | 2 + .../Core/vtkInteractorStyleSwitchBase.cxx | 2 + Rendering/Core/vtkInteractorStyleSwitchBase.h | 2 + Rendering/Core/vtkLODProp3D.cxx | 2 + Rendering/Core/vtkLODProp3D.h | 2 + Rendering/Core/vtkLabeledContourMapper.cxx | 2 + Rendering/Core/vtkLabeledContourMapper.h | 2 + Rendering/Core/vtkLight.cxx | 2 + Rendering/Core/vtkLight.h | 2 + Rendering/Core/vtkLightActor.cxx | 2 + Rendering/Core/vtkLightActor.h | 2 + Rendering/Core/vtkLightCollection.cxx | 2 + Rendering/Core/vtkLightCollection.h | 2 + Rendering/Core/vtkLightKit.cxx | 2 + Rendering/Core/vtkLightKit.h | 2 + Rendering/Core/vtkLogLookupTable.cxx | 2 + Rendering/Core/vtkLogLookupTable.h | 2 + Rendering/Core/vtkLookupTableWithEnabling.cxx | 2 + Rendering/Core/vtkLookupTableWithEnabling.h | 2 + Rendering/Core/vtkMapArrayValues.cxx | 2 + Rendering/Core/vtkMapArrayValues.h | 2 + Rendering/Core/vtkMapper.cxx | 2 + Rendering/Core/vtkMapper.h | 2 + Rendering/Core/vtkMapper2D.cxx | 2 + Rendering/Core/vtkMapper2D.h | 2 + Rendering/Core/vtkMapperCollection.cxx | 2 + Rendering/Core/vtkMapperCollection.h | 2 + Rendering/Core/vtkNoise200x200.h | 2 + Rendering/Core/vtkObserverMediator.cxx | 2 + Rendering/Core/vtkObserverMediator.h | 2 + Rendering/Core/vtkPicker.cxx | 2 + Rendering/Core/vtkPicker.h | 2 + Rendering/Core/vtkPickingManager.cxx | 2 + Rendering/Core/vtkPickingManager.h | 2 + Rendering/Core/vtkPointGaussianMapper.cxx | 2 + Rendering/Core/vtkPointGaussianMapper.h | 2 + Rendering/Core/vtkPointPicker.cxx | 2 + Rendering/Core/vtkPointPicker.h | 2 + Rendering/Core/vtkPolyDataMapper.cxx | 2 + Rendering/Core/vtkPolyDataMapper.h | 2 + Rendering/Core/vtkPolyDataMapper2D.cxx | 2 + Rendering/Core/vtkPolyDataMapper2D.h | 2 + Rendering/Core/vtkProp.cxx | 2 + Rendering/Core/vtkProp.h | 2 + Rendering/Core/vtkProp3D.cxx | 2 + Rendering/Core/vtkProp3D.h | 2 + Rendering/Core/vtkProp3DCollection.cxx | 2 + Rendering/Core/vtkProp3DCollection.h | 2 + Rendering/Core/vtkProp3DFollower.cxx | 2 + Rendering/Core/vtkProp3DFollower.h | 2 + Rendering/Core/vtkPropAssembly.cxx | 2 + Rendering/Core/vtkPropAssembly.h | 2 + Rendering/Core/vtkPropCollection.cxx | 2 + Rendering/Core/vtkPropCollection.h | 2 + Rendering/Core/vtkPropPicker.cxx | 2 + Rendering/Core/vtkPropPicker.h | 2 + Rendering/Core/vtkProperty.cxx | 2 + Rendering/Core/vtkProperty.h | 2 + Rendering/Core/vtkProperty2D.cxx | 2 + Rendering/Core/vtkProperty2D.h | 2 + Rendering/Core/vtkPythagoreanQuadruples.h | 5 + Rendering/Core/vtkRayCastStructures.h | 4 + Rendering/Core/vtkRenderPass.cxx | 2 + Rendering/Core/vtkRenderPass.h | 2 + Rendering/Core/vtkRenderState.cxx | 2 + Rendering/Core/vtkRenderState.h | 2 + Rendering/Core/vtkRenderTimerLog.cxx | 2 + Rendering/Core/vtkRenderTimerLog.h | 2 + Rendering/Core/vtkRenderWidget.cxx | 2 + Rendering/Core/vtkRenderWidget.h | 2 + Rendering/Core/vtkRenderWindow.cxx | 2 + Rendering/Core/vtkRenderWindow.h | 2 + Rendering/Core/vtkRenderWindowCollection.cxx | 2 + Rendering/Core/vtkRenderWindowCollection.h | 2 + Rendering/Core/vtkRenderWindowInteractor.cxx | 2 + Rendering/Core/vtkRenderWindowInteractor.h | 2 + .../Core/vtkRenderWindowInteractor3D.cxx | 2 + Rendering/Core/vtkRenderWindowInteractor3D.h | 2 + Rendering/Core/vtkRenderedAreaPicker.cxx | 2 + Rendering/Core/vtkRenderedAreaPicker.h | 2 + Rendering/Core/vtkRenderer.cxx | 2 + Rendering/Core/vtkRenderer.h | 2 + Rendering/Core/vtkRendererCollection.cxx | 2 + Rendering/Core/vtkRendererCollection.h | 2 + Rendering/Core/vtkRendererDelegate.cxx | 2 + Rendering/Core/vtkRendererDelegate.h | 2 + Rendering/Core/vtkRendererSource.cxx | 2 + Rendering/Core/vtkRendererSource.h | 2 + Rendering/Core/vtkRenderingCoreEnums.h | 4 + .../Core/vtkResizingWindowToImageFilter.cxx | 2 + .../Core/vtkResizingWindowToImageFilter.h | 2 + Rendering/Core/vtkScenePicker.cxx | 2 + Rendering/Core/vtkScenePicker.h | 2 + Rendering/Core/vtkSelectVisiblePoints.cxx | 2 + Rendering/Core/vtkSelectVisiblePoints.h | 2 + Rendering/Core/vtkShaderProperty.cxx | 2 + Rendering/Core/vtkShaderProperty.h | 2 + Rendering/Core/vtkSkybox.cxx | 2 + Rendering/Core/vtkSkybox.h | 2 + Rendering/Core/vtkStateStorage.h | 8 +- Rendering/Core/vtkStereoCompositor.cxx | 2 + Rendering/Core/vtkStereoCompositor.h | 2 + Rendering/Core/vtkStringToImage.cxx | 2 + Rendering/Core/vtkStringToImage.h | 2 + Rendering/Core/vtkTDxConfigure.h.in | 1 + Rendering/Core/vtkTDxInteractorStyle.cxx | 2 + Rendering/Core/vtkTDxInteractorStyle.h | 2 + .../Core/vtkTDxInteractorStyleCamera.cxx | 2 + Rendering/Core/vtkTDxInteractorStyleCamera.h | 2 + .../Core/vtkTDxInteractorStyleSettings.cxx | 2 + .../Core/vtkTDxInteractorStyleSettings.h | 2 + Rendering/Core/vtkTDxMotionEventInfo.h | 2 + Rendering/Core/vtkTextActor.cxx | 2 + Rendering/Core/vtkTextActor.h | 2 + Rendering/Core/vtkTextActor3D.cxx | 2 + Rendering/Core/vtkTextActor3D.h | 2 + Rendering/Core/vtkTextMapper.cxx | 2 + Rendering/Core/vtkTextMapper.h | 2 + Rendering/Core/vtkTextProperty.cxx | 2 + Rendering/Core/vtkTextProperty.h | 2 + Rendering/Core/vtkTextPropertyCollection.cxx | 2 + Rendering/Core/vtkTextPropertyCollection.h | 2 + Rendering/Core/vtkTextRenderer.cxx | 2 + Rendering/Core/vtkTextRenderer.h | 5 + Rendering/Core/vtkTexture.cxx | 2 + Rendering/Core/vtkTexture.h | 2 + Rendering/Core/vtkTexturedActor2D.cxx | 2 + Rendering/Core/vtkTexturedActor2D.h | 2 + .../Core/vtkTransformCoordinateSystems.cxx | 2 + .../Core/vtkTransformCoordinateSystems.h | 2 + Rendering/Core/vtkTransformInterpolator.cxx | 2 + Rendering/Core/vtkTransformInterpolator.h | 2 + Rendering/Core/vtkTupleInterpolator.cxx | 2 + Rendering/Core/vtkTupleInterpolator.h | 2 + Rendering/Core/vtkUniforms.cxx | 2 + Rendering/Core/vtkUniforms.h | 2 + .../Core/vtkViewDependentErrorMetric.cxx | 2 + Rendering/Core/vtkViewDependentErrorMetric.h | 2 + Rendering/Core/vtkViewport.cxx | 2 + Rendering/Core/vtkViewport.h | 2 + Rendering/Core/vtkVisibilitySort.cxx | 2 + Rendering/Core/vtkVisibilitySort.h | 2 + Rendering/Core/vtkVolume.cxx | 2 + Rendering/Core/vtkVolume.h | 2 + Rendering/Core/vtkVolumeCollection.cxx | 2 + Rendering/Core/vtkVolumeCollection.h | 2 + Rendering/Core/vtkVolumeProperty.cxx | 2 + Rendering/Core/vtkVolumeProperty.h | 2 + Rendering/Core/vtkWindowLevelLookupTable.cxx | 2 + Rendering/Core/vtkWindowLevelLookupTable.h | 2 + Rendering/Core/vtkWindowToImageFilter.cxx | 2 + Rendering/Core/vtkWindowToImageFilter.h | 2 + Rendering/Core/vtkWorldPointPicker.cxx | 2 + Rendering/Core/vtkWorldPointPicker.h | 2 + Rendering/External/ExternalVTKWidget.cxx | 2 + Rendering/External/ExternalVTKWidget.h | 3 + Rendering/External/vtkExternalLight.cxx | 2 + Rendering/External/vtkExternalLight.h | 2 + .../External/vtkExternalOpenGLCamera.cxx | 2 + Rendering/External/vtkExternalOpenGLCamera.h | 2 + .../vtkExternalOpenGLRenderWindow.cxx | 2 + .../External/vtkExternalOpenGLRenderWindow.h | 2 + .../External/vtkExternalOpenGLRenderer.cxx | 2 + .../External/vtkExternalOpenGLRenderer.h | 2 + .../FFMPEGOpenGL2/vtkOpenGLMovieSphere.cxx | 2 + .../FFMPEGOpenGL2/vtkOpenGLMovieSphere.h | 2 + Rendering/FreeType/fonts/face_arial.cxx | 2 + Rendering/FreeType/fonts/face_arial_bold.cxx | 2 + .../FreeType/fonts/face_arial_bold_italic.cxx | 2 + .../FreeType/fonts/face_arial_italic.cxx | 2 + Rendering/FreeType/fonts/face_courier.cxx | 2 + .../FreeType/fonts/face_courier_bold.cxx | 2 + .../fonts/face_courier_bold_italic.cxx | 2 + .../FreeType/fonts/face_courier_italic.cxx | 2 + Rendering/FreeType/fonts/face_times.cxx | 2 + Rendering/FreeType/fonts/face_times_bold.cxx | 2 + .../FreeType/fonts/face_times_bold_italic.cxx | 2 + .../FreeType/fonts/face_times_italic.cxx | 2 + Rendering/FreeType/fonts/vtkEmbeddedFonts.h | 4 + .../FreeType/vtkFreeTypeStringToImage.cxx | 2 + Rendering/FreeType/vtkFreeTypeStringToImage.h | 2 + Rendering/FreeType/vtkFreeTypeTools.cxx | 11 + Rendering/FreeType/vtkFreeTypeTools.h | 4 + .../vtkMathTextFreeTypeTextRenderer.cxx | 2 + .../vtkMathTextFreeTypeTextRenderer.h | 2 + Rendering/FreeType/vtkMathTextUtilities.cxx | 2 + Rendering/FreeType/vtkMathTextUtilities.h | 2 + Rendering/FreeType/vtkScaledTextActor.cxx | 2 + Rendering/FreeType/vtkScaledTextActor.h | 2 + .../FreeType/vtkTextRendererStringToImage.cxx | 2 + .../FreeType/vtkTextRendererStringToImage.h | 2 + Rendering/FreeType/vtkVectorText.cxx | 4 + Rendering/FreeType/vtkVectorText.h | 2 + Rendering/FreeType/vtkVectorTextData.cxx | 2 + .../vtkFontConfigFreeTypeTools.cxx | 2 + .../vtkFontConfigFreeTypeTools.h | 2 + .../GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx | 2 + .../GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.h | 2 + .../HyperTreeGrid/vtkHyperTreeGridMapper.cxx | 2 + .../HyperTreeGrid/vtkHyperTreeGridMapper.h | 2 + Rendering/Image/vtkDepthImageToPointCloud.cxx | 2 + Rendering/Image/vtkDepthImageToPointCloud.h | 2 + Rendering/Image/vtkImageResliceMapper.cxx | 2 + Rendering/Image/vtkImageResliceMapper.h | 2 + Rendering/Image/vtkImageSliceCollection.cxx | 2 + Rendering/Image/vtkImageSliceCollection.h | 2 + Rendering/Image/vtkImageStack.cxx | 2 + Rendering/Image/vtkImageStack.h | 2 + .../Testing/Cxx/vtkSurfaceLICTestDriver.h | 3 + .../vtkCompositeSurfaceLICMapper.cxx | 2 + .../LICOpenGL2/vtkCompositeSurfaceLICMapper.h | 2 + Rendering/LICOpenGL2/vtkImageDataLIC2D.cxx | 2 + Rendering/LICOpenGL2/vtkImageDataLIC2D.h | 2 + Rendering/LICOpenGL2/vtkLICNoiseHelper.cxx | 2 + Rendering/LICOpenGL2/vtkLICNoiseHelper.h | 2 + .../vtkLineIntegralConvolution2D.cxx | 12 +- .../LICOpenGL2/vtkLineIntegralConvolution2D.h | 2 + Rendering/LICOpenGL2/vtkPainterCommunicator.h | 2 + .../LICOpenGL2/vtkStructuredGridLIC2D.cxx | 2 + Rendering/LICOpenGL2/vtkStructuredGridLIC2D.h | 2 + .../LICOpenGL2/vtkSurfaceLICComposite.cxx | 2 + Rendering/LICOpenGL2/vtkSurfaceLICComposite.h | 3 + Rendering/LICOpenGL2/vtkSurfaceLICHelper.cxx | 2 + Rendering/LICOpenGL2/vtkSurfaceLICHelper.h | 2 + .../LICOpenGL2/vtkSurfaceLICInterface.cxx | 4 + Rendering/LICOpenGL2/vtkSurfaceLICInterface.h | 2 + Rendering/LICOpenGL2/vtkSurfaceLICMapper.cxx | 2 + Rendering/LICOpenGL2/vtkSurfaceLICMapper.h | 2 + Rendering/LICOpenGL2/vtkTextureIO.cxx | 2 + Rendering/LICOpenGL2/vtkTextureIO.h | 2 + Rendering/LOD/vtkLODActor.cxx | 2 + Rendering/LOD/vtkLODActor.h | 2 + Rendering/LOD/vtkQuadricLODActor.cxx | 2 + Rendering/LOD/vtkQuadricLODActor.h | 2 + Rendering/Label/vtkDynamic2DLabelMapper.cxx | 2 + Rendering/Label/vtkDynamic2DLabelMapper.h | 2 + .../Label/vtkFreeTypeLabelRenderStrategy.cxx | 2 + .../Label/vtkFreeTypeLabelRenderStrategy.h | 2 + Rendering/Label/vtkLabelHierarchy.cxx | 2 + Rendering/Label/vtkLabelHierarchy.h | 2 + .../Label/vtkLabelHierarchyAlgorithm.cxx | 2 + Rendering/Label/vtkLabelHierarchyAlgorithm.h | 2 + .../vtkLabelHierarchyCompositeIterator.cxx | 2 + .../vtkLabelHierarchyCompositeIterator.h | 2 + Rendering/Label/vtkLabelHierarchyIterator.cxx | 2 + Rendering/Label/vtkLabelHierarchyIterator.h | 2 + Rendering/Label/vtkLabelHierarchyPrivate.h | 2 + Rendering/Label/vtkLabelPlacementMapper.cxx | 2 + Rendering/Label/vtkLabelPlacementMapper.h | 2 + Rendering/Label/vtkLabelPlacer.cxx | 2 + Rendering/Label/vtkLabelPlacer.h | 2 + Rendering/Label/vtkLabelRenderStrategy.cxx | 2 + Rendering/Label/vtkLabelRenderStrategy.h | 2 + Rendering/Label/vtkLabelSizeCalculator.cxx | 2 + Rendering/Label/vtkLabelSizeCalculator.h | 2 + Rendering/Label/vtkLabeledDataMapper.cxx | 2 + Rendering/Label/vtkLabeledDataMapper.h | 2 + .../Label/vtkLabeledTreeMapDataMapper.cxx | 2 + Rendering/Label/vtkLabeledTreeMapDataMapper.h | 2 + .../Label/vtkPointSetToLabelHierarchy.cxx | 2 + Rendering/Label/vtkPointSetToLabelHierarchy.h | 2 + .../vtkMatplotlibMathTextUtilities.cxx | 2 + .../vtkMatplotlibMathTextUtilities.h | 5 +- Rendering/OpenGL2/vtkCameraPass.cxx | 2 + Rendering/OpenGL2/vtkCameraPass.h | 2 + Rendering/OpenGL2/vtkClearRGBPass.cxx | 2 + Rendering/OpenGL2/vtkClearRGBPass.h | 2 + Rendering/OpenGL2/vtkClearZPass.cxx | 2 + Rendering/OpenGL2/vtkClearZPass.h | 2 + Rendering/OpenGL2/vtkCocoaGLView.h | 2 + Rendering/OpenGL2/vtkCocoaRenderWindow.h | 2 + Rendering/OpenGL2/vtkCocoaRenderWindow.mm | 4 + Rendering/OpenGL2/vtkCompositeMapperHelper2.h | 2 + .../OpenGL2/vtkCompositePolyDataMapper2.cxx | 2 + .../OpenGL2/vtkCompositePolyDataMapper2.h | 2 + Rendering/OpenGL2/vtkDataTransferHelper.cxx | 2 + Rendering/OpenGL2/vtkDataTransferHelper.h | 2 + Rendering/OpenGL2/vtkDefaultPass.cxx | 2 + Rendering/OpenGL2/vtkDefaultPass.h | 2 + .../OpenGL2/vtkDepthImageProcessingPass.cxx | 2 + .../OpenGL2/vtkDepthImageProcessingPass.h | 2 + Rendering/OpenGL2/vtkDepthOfFieldPass.cxx | 2 + Rendering/OpenGL2/vtkDepthOfFieldPass.h | 2 + Rendering/OpenGL2/vtkDepthPeelingPass.cxx | 2 + Rendering/OpenGL2/vtkDepthPeelingPass.h | 2 + Rendering/OpenGL2/vtkDualDepthPeelingPass.cxx | 2 + Rendering/OpenGL2/vtkDualDepthPeelingPass.h | 2 + Rendering/OpenGL2/vtkDummyGPUInfoList.cxx | 2 + Rendering/OpenGL2/vtkDummyGPUInfoList.h | 2 + Rendering/OpenGL2/vtkEDLShading.cxx | 2 + Rendering/OpenGL2/vtkEDLShading.h | 2 + Rendering/OpenGL2/vtkEGLRenderWindow.cxx | 2 + Rendering/OpenGL2/vtkEGLRenderWindow.h | 2 + .../vtkEquirectangularToCubeMapTexture.cxx | 2 + .../vtkEquirectangularToCubeMapTexture.h | 2 + Rendering/OpenGL2/vtkFramebufferPass.cxx | 2 + Rendering/OpenGL2/vtkFramebufferPass.h | 2 + Rendering/OpenGL2/vtkGaussianBlurPass.cxx | 2 + Rendering/OpenGL2/vtkGaussianBlurPass.h | 2 + .../OpenGL2/vtkGenericOpenGLRenderWindow.cxx | 2 + .../OpenGL2/vtkGenericOpenGLRenderWindow.h | 2 + .../OpenGL2/vtkHiddenLineRemovalPass.cxx | 2 + Rendering/OpenGL2/vtkHiddenLineRemovalPass.h | 2 + Rendering/OpenGL2/vtkIOSRenderWindow.h | 2 + Rendering/OpenGL2/vtkIOSRenderWindow.mm | 2 + Rendering/OpenGL2/vtkImageProcessingPass.cxx | 2 + Rendering/OpenGL2/vtkImageProcessingPass.h | 2 + Rendering/OpenGL2/vtkLightingMapPass.cxx | 2 + Rendering/OpenGL2/vtkLightingMapPass.h | 2 + Rendering/OpenGL2/vtkLightsPass.cxx | 2 + Rendering/OpenGL2/vtkLightsPass.h | 2 + Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx | 2 + Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h | 2 + Rendering/OpenGL2/vtkOpaquePass.cxx | 2 + Rendering/OpenGL2/vtkOpaquePass.h | 2 + Rendering/OpenGL2/vtkOpenGLActor.cxx | 2 + Rendering/OpenGL2/vtkOpenGLActor.h | 2 + .../OpenGL2/vtkOpenGLBillboardTextActor3D.cxx | 2 + .../OpenGL2/vtkOpenGLBillboardTextActor3D.h | 2 + Rendering/OpenGL2/vtkOpenGLBufferObject.cxx | 2 + Rendering/OpenGL2/vtkOpenGLBufferObject.h | 2 + Rendering/OpenGL2/vtkOpenGLCamera.cxx | 2 + Rendering/OpenGL2/vtkOpenGLCamera.h | 2 + .../OpenGL2/vtkOpenGLCellToVTKCellMap.cxx | 2 + Rendering/OpenGL2/vtkOpenGLCellToVTKCellMap.h | 2 + Rendering/OpenGL2/vtkOpenGLError.h.in | 2 + Rendering/OpenGL2/vtkOpenGLFXAAFilter.cxx | 2 + Rendering/OpenGL2/vtkOpenGLFXAAFilter.h | 2 + Rendering/OpenGL2/vtkOpenGLFXAAPass.cxx | 2 + Rendering/OpenGL2/vtkOpenGLFXAAPass.h | 2 + Rendering/OpenGL2/vtkOpenGLFluidMapper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLFluidMapper.h | 2 + .../OpenGL2/vtkOpenGLFramebufferObject.cxx | 2 + .../OpenGL2/vtkOpenGLFramebufferObject.h | 2 + Rendering/OpenGL2/vtkOpenGLGL2PSHelper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLGL2PSHelper.h | 2 + Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h | 2 + Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h | 2 + .../OpenGL2/vtkOpenGLHardwareSelector.cxx | 2 + Rendering/OpenGL2/vtkOpenGLHardwareSelector.h | 2 + Rendering/OpenGL2/vtkOpenGLHelper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLHelper.h | 2 + .../OpenGL2/vtkOpenGLHyperTreeGridMapper.cxx | 2 + .../OpenGL2/vtkOpenGLHyperTreeGridMapper.h | 2 + .../OpenGL2/vtkOpenGLImageAlgorithmHelper.cxx | 2 + .../OpenGL2/vtkOpenGLImageAlgorithmHelper.h | 2 + Rendering/OpenGL2/vtkOpenGLImageMapper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLImageMapper.h | 2 + .../OpenGL2/vtkOpenGLImageSliceMapper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h | 2 + .../OpenGL2/vtkOpenGLIndexBufferObject.cxx | 2 + .../OpenGL2/vtkOpenGLIndexBufferObject.h | 2 + .../OpenGL2/vtkOpenGLInstanceCulling.cxx | 2 + Rendering/OpenGL2/vtkOpenGLInstanceCulling.h | 2 + .../OpenGL2/vtkOpenGLLabeledContourMapper.cxx | 2 + .../OpenGL2/vtkOpenGLLabeledContourMapper.h | 2 + Rendering/OpenGL2/vtkOpenGLLight.cxx | 2 + Rendering/OpenGL2/vtkOpenGLLight.h | 2 + .../OpenGL2/vtkOpenGLPointGaussianMapper.cxx | 2 + .../OpenGL2/vtkOpenGLPointGaussianMapper.h | 2 + Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h | 2 + .../OpenGL2/vtkOpenGLPolyDataMapper2D.cxx | 2 + Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h | 2 + Rendering/OpenGL2/vtkOpenGLProperty.cxx | 2 + Rendering/OpenGL2/vtkOpenGLProperty.h | 2 + Rendering/OpenGL2/vtkOpenGLQuadHelper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLQuadHelper.h | 2 + Rendering/OpenGL2/vtkOpenGLRenderPass.cxx | 2 + Rendering/OpenGL2/vtkOpenGLRenderPass.h | 2 + Rendering/OpenGL2/vtkOpenGLRenderTimer.cxx | 2 + Rendering/OpenGL2/vtkOpenGLRenderTimer.h | 2 + Rendering/OpenGL2/vtkOpenGLRenderTimerLog.cxx | 2 + Rendering/OpenGL2/vtkOpenGLRenderTimerLog.h | 2 + .../OpenGL2/vtkOpenGLRenderUtilities.cxx | 2 + Rendering/OpenGL2/vtkOpenGLRenderUtilities.h | 2 + Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx | 6 + Rendering/OpenGL2/vtkOpenGLRenderWindow.h | 2 + Rendering/OpenGL2/vtkOpenGLRenderer.cxx | 2 + Rendering/OpenGL2/vtkOpenGLRenderer.h | 2 + .../OpenGL2/vtkOpenGLResourceFreeCallback.h | 2 + Rendering/OpenGL2/vtkOpenGLShaderCache.cxx | 2 + Rendering/OpenGL2/vtkOpenGLShaderCache.h | 2 + Rendering/OpenGL2/vtkOpenGLShaderProperty.cxx | 2 + Rendering/OpenGL2/vtkOpenGLShaderProperty.h | 2 + Rendering/OpenGL2/vtkOpenGLSkybox.cxx | 2 + Rendering/OpenGL2/vtkOpenGLSkybox.h | 2 + Rendering/OpenGL2/vtkOpenGLSphereMapper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLSphereMapper.h | 2 + Rendering/OpenGL2/vtkOpenGLState.cxx | 4 + Rendering/OpenGL2/vtkOpenGLState.h | 2 + Rendering/OpenGL2/vtkOpenGLStickMapper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLStickMapper.h | 2 + Rendering/OpenGL2/vtkOpenGLTextActor.cxx | 2 + Rendering/OpenGL2/vtkOpenGLTextActor.h | 2 + Rendering/OpenGL2/vtkOpenGLTextActor3D.cxx | 2 + Rendering/OpenGL2/vtkOpenGLTextActor3D.h | 2 + Rendering/OpenGL2/vtkOpenGLTextMapper.cxx | 2 + Rendering/OpenGL2/vtkOpenGLTextMapper.h | 2 + Rendering/OpenGL2/vtkOpenGLTexture.cxx | 2 + Rendering/OpenGL2/vtkOpenGLTexture.h | 2 + Rendering/OpenGL2/vtkOpenGLUniforms.cxx | 6 + Rendering/OpenGL2/vtkOpenGLUniforms.h | 2 + .../OpenGL2/vtkOpenGLVertexArrayObject.cxx | 2 + .../OpenGL2/vtkOpenGLVertexArrayObject.h | 2 + .../OpenGL2/vtkOpenGLVertexBufferObject.cxx | 2 + .../OpenGL2/vtkOpenGLVertexBufferObject.h | 2 + .../vtkOpenGLVertexBufferObjectCache.cxx | 2 + .../vtkOpenGLVertexBufferObjectCache.h | 2 + .../vtkOpenGLVertexBufferObjectGroup.cxx | 2 + .../vtkOpenGLVertexBufferObjectGroup.h | 2 + .../vtkOrderIndependentTranslucentPass.cxx | 2 + .../vtkOrderIndependentTranslucentPass.h | 2 + Rendering/OpenGL2/vtkOutlineGlowPass.cxx | 2 + Rendering/OpenGL2/vtkOutlineGlowPass.h | 2 + Rendering/OpenGL2/vtkOverlayPass.cxx | 2 + Rendering/OpenGL2/vtkOverlayPass.h | 2 + Rendering/OpenGL2/vtkPBRIrradianceTexture.cxx | 2 + Rendering/OpenGL2/vtkPBRIrradianceTexture.h | 2 + Rendering/OpenGL2/vtkPBRLUTTexture.cxx | 2 + Rendering/OpenGL2/vtkPBRLUTTexture.h | 2 + Rendering/OpenGL2/vtkPBRPrefilterTexture.cxx | 2 + Rendering/OpenGL2/vtkPBRPrefilterTexture.h | 2 + .../OpenGL2/vtkPanoramicProjectionPass.cxx | 2 + .../OpenGL2/vtkPanoramicProjectionPass.h | 2 + Rendering/OpenGL2/vtkPixelBufferObject.cxx | 4 + Rendering/OpenGL2/vtkPixelBufferObject.h | 2 + Rendering/OpenGL2/vtkPointFillPass.cxx | 2 + Rendering/OpenGL2/vtkPointFillPass.h | 2 + Rendering/OpenGL2/vtkRenderPassCollection.cxx | 2 + Rendering/OpenGL2/vtkRenderPassCollection.h | 2 + Rendering/OpenGL2/vtkRenderStepsPass.cxx | 2 + Rendering/OpenGL2/vtkRenderStepsPass.h | 2 + Rendering/OpenGL2/vtkRenderbuffer.cxx | 2 + Rendering/OpenGL2/vtkRenderbuffer.h | 2 + .../OpenGL2/vtkSDL2OpenGLRenderWindow.cxx | 2 + Rendering/OpenGL2/vtkSDL2OpenGLRenderWindow.h | 2 + Rendering/OpenGL2/vtkSSAAPass.cxx | 2 + Rendering/OpenGL2/vtkSSAAPass.h | 2 + Rendering/OpenGL2/vtkSSAOPass.cxx | 2 + Rendering/OpenGL2/vtkSSAOPass.h | 2 + Rendering/OpenGL2/vtkSequencePass.cxx | 2 + Rendering/OpenGL2/vtkSequencePass.h | 2 + Rendering/OpenGL2/vtkShader.cxx | 2 + Rendering/OpenGL2/vtkShader.h | 2 + Rendering/OpenGL2/vtkShaderProgram.cxx | 2 + Rendering/OpenGL2/vtkShaderProgram.h | 2 + Rendering/OpenGL2/vtkShadowMapBakerPass.cxx | 2 + Rendering/OpenGL2/vtkShadowMapBakerPass.h | 2 + Rendering/OpenGL2/vtkShadowMapPass.cxx | 2 + Rendering/OpenGL2/vtkShadowMapPass.h | 2 + Rendering/OpenGL2/vtkSimpleMotionBlurPass.cxx | 2 + Rendering/OpenGL2/vtkSimpleMotionBlurPass.h | 2 + .../OpenGL2/vtkSobelGradientMagnitudePass.cxx | 2 + .../OpenGL2/vtkSobelGradientMagnitudePass.h | 2 + Rendering/OpenGL2/vtkTestOpenGLVersion.cxx | 4 + Rendering/OpenGL2/vtkTestOpenGLVersion.h | 4 + Rendering/OpenGL2/vtkTextureObject.cxx | 2 + Rendering/OpenGL2/vtkTextureObject.h | 2 + Rendering/OpenGL2/vtkTextureUnitManager.cxx | 2 + Rendering/OpenGL2/vtkTextureUnitManager.h | 2 + Rendering/OpenGL2/vtkToneMappingPass.cxx | 2 + Rendering/OpenGL2/vtkToneMappingPass.h | 2 + Rendering/OpenGL2/vtkTransformFeedback.cxx | 2 + Rendering/OpenGL2/vtkTransformFeedback.h | 2 + Rendering/OpenGL2/vtkTranslucentPass.cxx | 2 + Rendering/OpenGL2/vtkTranslucentPass.h | 2 + Rendering/OpenGL2/vtkValuePass.cxx | 2 + Rendering/OpenGL2/vtkValuePass.h | 2 + Rendering/OpenGL2/vtkVolumetricPass.cxx | 2 + Rendering/OpenGL2/vtkVolumetricPass.h | 2 + .../OpenGL2/vtkWin32OpenGLDXRenderWindow.cxx | 2 + .../OpenGL2/vtkWin32OpenGLDXRenderWindow.h | 2 + .../OpenGL2/vtkWin32OpenGLRenderWindow.cxx | 2 + .../OpenGL2/vtkWin32OpenGLRenderWindow.h | 2 + Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx | 2 + Rendering/OpenGL2/vtkXOpenGLRenderWindow.h | 2 + Rendering/OpenVR/vtkOpenVRCamera.cxx | 2 + Rendering/OpenVR/vtkOpenVRCamera.h | 2 + Rendering/OpenVR/vtkOpenVRControlsHelper.cxx | 2 + Rendering/OpenVR/vtkOpenVRControlsHelper.h | 2 + Rendering/OpenVR/vtkOpenVRDefaultOverlay.cxx | 2 + Rendering/OpenVR/vtkOpenVRDefaultOverlay.h | 2 + Rendering/OpenVR/vtkOpenVRInteractorStyle.cxx | 2 + Rendering/OpenVR/vtkOpenVRInteractorStyle.h | 2 + Rendering/OpenVR/vtkOpenVRModel.cxx | 2 + Rendering/OpenVR/vtkOpenVRModel.h | 2 + Rendering/OpenVR/vtkOpenVROverlay.cxx | 2 + Rendering/OpenVR/vtkOpenVROverlay.h | 2 + Rendering/OpenVR/vtkOpenVROverlayInternal.h | 2 + Rendering/OpenVR/vtkOpenVRRenderWindow.cxx | 2 + Rendering/OpenVR/vtkOpenVRRenderWindow.h | 2 + .../vtkOpenVRRenderWindowInteractor.cxx | 2 + .../OpenVR/vtkOpenVRRenderWindowInteractor.h | 2 + Rendering/OpenVR/vtkOpenVRRenderer.cxx | 2 + Rendering/OpenVR/vtkOpenVRRenderer.h | 2 + Rendering/OpenXR/XrExtensions.h | 2 + Rendering/OpenXR/XrGraphicsExtensions.h | 2 + Rendering/OpenXR/vtkOpenXRCamera.cxx | 2 + Rendering/OpenXR/vtkOpenXRCamera.h | 2 + Rendering/OpenXR/vtkOpenXRControlsHelper.cxx | 2 + Rendering/OpenXR/vtkOpenXRControlsHelper.h | 2 + Rendering/OpenXR/vtkOpenXRInteractorStyle.cxx | 2 + Rendering/OpenXR/vtkOpenXRInteractorStyle.h | 2 + Rendering/OpenXR/vtkOpenXRManager.cxx | 2 + Rendering/OpenXR/vtkOpenXRManager.h | 2 + .../OpenXR/vtkOpenXRManagerConnection.cxx | 2 + Rendering/OpenXR/vtkOpenXRManagerConnection.h | 2 + Rendering/OpenXR/vtkOpenXRManagerGraphics.cxx | 2 + Rendering/OpenXR/vtkOpenXRManagerGraphics.h | 2 + .../OpenXR/vtkOpenXRManagerOpenGLGraphics.cxx | 4 + .../OpenXR/vtkOpenXRManagerOpenGLGraphics.h | 2 + Rendering/OpenXR/vtkOpenXRModel.cxx | 2 + Rendering/OpenXR/vtkOpenXRModel.h | 2 + Rendering/OpenXR/vtkOpenXRRenderWindow.cxx | 2 + Rendering/OpenXR/vtkOpenXRRenderWindow.h | 2 + .../vtkOpenXRRenderWindowInteractor.cxx | 2 + .../OpenXR/vtkOpenXRRenderWindowInteractor.h | 2 + Rendering/OpenXR/vtkOpenXRRenderer.cxx | 2 + Rendering/OpenXR/vtkOpenXRRenderer.h | 2 + Rendering/OpenXR/vtkOpenXRUtilities.h | 2 + .../OpenXRRemoting/XrConnectionExtensions.h | 2 + .../vtkOpenXRManagerD3DGraphics.cxx | 2 + .../vtkOpenXRManagerD3DGraphics.h | 2 + .../vtkOpenXRManagerRemoteConnection.cxx | 2 + .../vtkOpenXRManagerRemoteConnection.h | 2 + .../vtkOpenXRRemotingRenderWindow.cxx | 2 + .../vtkOpenXRRemotingRenderWindow.h | 2 + .../Parallel/vtkClientServerCompositePass.cxx | 2 + .../Parallel/vtkClientServerCompositePass.h | 2 + .../vtkClientServerSynchronizedRenderers.cxx | 2 + .../vtkClientServerSynchronizedRenderers.h | 2 + Rendering/Parallel/vtkCompositeRGBAPass.cxx | 2 + Rendering/Parallel/vtkCompositeRGBAPass.h | 2 + .../Parallel/vtkCompositeRenderManager.cxx | 2 + .../Parallel/vtkCompositeRenderManager.h | 2 + Rendering/Parallel/vtkCompositeZPass.cxx | 2 + Rendering/Parallel/vtkCompositeZPass.h | 2 + .../vtkCompositedSynchronizedRenderers.cxx | 2 + .../vtkCompositedSynchronizedRenderers.h | 2 + Rendering/Parallel/vtkCompositer.cxx | 2 + Rendering/Parallel/vtkCompositer.h | 2 + Rendering/Parallel/vtkCompressCompositer.cxx | 2 + Rendering/Parallel/vtkCompressCompositer.h | 2 + Rendering/Parallel/vtkImageRenderManager.cxx | 2 + Rendering/Parallel/vtkImageRenderManager.h | 2 + Rendering/Parallel/vtkPHardwareSelector.cxx | 2 + Rendering/Parallel/vtkPHardwareSelector.h | 2 + .../Parallel/vtkParallelRenderManager.cxx | 2 + Rendering/Parallel/vtkParallelRenderManager.h | 2 + .../Parallel/vtkSynchronizedRenderWindows.cxx | 2 + .../Parallel/vtkSynchronizedRenderWindows.h | 2 + .../Parallel/vtkSynchronizedRenderers.cxx | 2 + Rendering/Parallel/vtkSynchronizedRenderers.h | 2 + Rendering/Parallel/vtkTreeCompositer.cxx | 2 + Rendering/Parallel/vtkTreeCompositer.h | 2 + Rendering/ParallelLIC/vtkMPIPixelTT.cxx | 2 + Rendering/ParallelLIC/vtkMPIPixelTT.h | 2 + Rendering/ParallelLIC/vtkMPIPixelView.h | 2 + .../vtkPLineIntegralConvolution2D.cxx | 2 + .../vtkPLineIntegralConvolution2D.h | 2 + .../ParallelLIC/vtkPPainterCommunicator.cxx | 2 + .../ParallelLIC/vtkPPainterCommunicator.h | 2 + Rendering/ParallelLIC/vtkPPixelTransfer.cxx | 3 + Rendering/ParallelLIC/vtkPPixelTransfer.h | 2 + .../ParallelLIC/vtkPSurfaceLICComposite.cxx | 4 + .../ParallelLIC/vtkPSurfaceLICComposite.h | 2 + .../ParallelLIC/vtkPSurfaceLICInterface.cxx | 2 + .../ParallelLIC/vtkPSurfaceLICInterface.h | 2 + Rendering/ParallelLIC/vtkParallelTimer.cxx | 4 + Rendering/ParallelLIC/vtkParallelTimer.h | 2 + Rendering/PythonContext2D/vtkPythonItem.cxx | 2 + Rendering/PythonContext2D/vtkPythonItem.h | 2 + Rendering/Qt/vtkQImageToImageSource.cxx | 2 + Rendering/Qt/vtkQImageToImageSource.h | 3 + Rendering/Qt/vtkQtInitialization.cxx | 2 + Rendering/Qt/vtkQtInitialization.h | 3 + Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 2 + Rendering/Qt/vtkQtLabelRenderStrategy.h | 2 + .../Qt/vtkQtLabelRenderStrategyInternals.h | 3 + Rendering/Qt/vtkQtStringToImage.cxx | 2 + Rendering/Qt/vtkQtStringToImage.h | 2 + Rendering/Qt/vtkQtTreeRingLabelMapper.cxx | 2 + Rendering/Qt/vtkQtTreeRingLabelMapper.h | 3 + Rendering/RayTracing/RTWrapper/Backend.h | 2 + .../RTWrapper/OSPRay/OSPRayBackend.h | 2 + Rendering/RayTracing/RTWrapper/RTWrapper.cxx | 6 + Rendering/RayTracing/RTWrapper/RTWrapper.h | 2 + Rendering/RayTracing/RTWrapper/Types.h | 7 + .../RayTracing/RTWrapper/VisRTX/Camera.h | 2 + Rendering/RayTracing/RTWrapper/VisRTX/Data.h | 2 + .../RayTracing/RTWrapper/VisRTX/FrameBuffer.h | 2 + .../RTWrapper/VisRTX/GeometricModel.h | 2 + .../RayTracing/RTWrapper/VisRTX/Geometry.h | 2 + Rendering/RayTracing/RTWrapper/VisRTX/Group.h | 2 + .../RayTracing/RTWrapper/VisRTX/Instance.h | 2 + Rendering/RayTracing/RTWrapper/VisRTX/Light.h | 2 + .../RayTracing/RTWrapper/VisRTX/Material.h | 4 +- .../RayTracing/RTWrapper/VisRTX/OSPRayMDL.h | 4 + .../RayTracing/RTWrapper/VisRTX/Object.h | 2 + .../RayTracing/RTWrapper/VisRTX/Renderer.h | 2 + .../RayTracing/RTWrapper/VisRTX/Texture.h | 2 + .../RTWrapper/VisRTX/VisRTXBackend.cxx | 2 + .../RTWrapper/VisRTX/VisRTXBackend.h | 2 + Rendering/RayTracing/RTWrapper/VisRTX/World.h | 2 + .../vtkOSPRayAMRVolumeMapperNode.cxx | 2 + .../RayTracing/vtkOSPRayAMRVolumeMapperNode.h | 2 + Rendering/RayTracing/vtkOSPRayActorNode.cxx | 2 + Rendering/RayTracing/vtkOSPRayActorNode.h | 2 + Rendering/RayTracing/vtkOSPRayCache.h | 2 + Rendering/RayTracing/vtkOSPRayCameraNode.cxx | 2 + Rendering/RayTracing/vtkOSPRayCameraNode.h | 2 + .../vtkOSPRayCompositePolyDataMapper2Node.cxx | 2 + .../vtkOSPRayCompositePolyDataMapper2Node.h | 2 + Rendering/RayTracing/vtkOSPRayLightNode.cxx | 2 + Rendering/RayTracing/vtkOSPRayLightNode.h | 2 + .../RayTracing/vtkOSPRayMaterialHelpers.cxx | 2 + .../RayTracing/vtkOSPRayMaterialHelpers.h | 4 + .../RayTracing/vtkOSPRayMaterialLibrary.cxx | 2 + .../RayTracing/vtkOSPRayMaterialLibrary.h | 2 + .../vtkOSPRayMoleculeMapperNode.cxx | 2 + .../RayTracing/vtkOSPRayMoleculeMapperNode.h | 2 + Rendering/RayTracing/vtkOSPRayPass.cxx | 2 + Rendering/RayTracing/vtkOSPRayPass.h | 2 + .../vtkOSPRayPointGaussianMapperNode.cxx | 5 + .../vtkOSPRayPointGaussianMapperNode.h | 2 + .../vtkOSPRayPolyDataMapperNode.cxx | 4 + .../RayTracing/vtkOSPRayPolyDataMapperNode.h | 2 + .../RayTracing/vtkOSPRayRendererNode.cxx | 4 + Rendering/RayTracing/vtkOSPRayRendererNode.h | 2 + .../vtkOSPRayUnstructuredVolumeMapperNode.cxx | 2 + .../vtkOSPRayUnstructuredVolumeMapperNode.h | 2 + .../RayTracing/vtkOSPRayViewNodeFactory.cxx | 2 + .../RayTracing/vtkOSPRayViewNodeFactory.h | 2 + .../RayTracing/vtkOSPRayVolumeMapper.cxx | 2 + Rendering/RayTracing/vtkOSPRayVolumeMapper.h | 2 + .../RayTracing/vtkOSPRayVolumeMapperNode.cxx | 2 + .../RayTracing/vtkOSPRayVolumeMapperNode.h | 2 + Rendering/RayTracing/vtkOSPRayVolumeNode.cxx | 2 + Rendering/RayTracing/vtkOSPRayVolumeNode.h | 2 + Rendering/RayTracing/vtkOSPRayWindowNode.cxx | 2 + Rendering/RayTracing/vtkOSPRayWindowNode.h | 2 + Rendering/SceneGraph/vtkActorNode.cxx | 2 + Rendering/SceneGraph/vtkActorNode.h | 2 + Rendering/SceneGraph/vtkCameraNode.cxx | 2 + Rendering/SceneGraph/vtkCameraNode.h | 2 + Rendering/SceneGraph/vtkLightNode.cxx | 2 + Rendering/SceneGraph/vtkLightNode.h | 2 + Rendering/SceneGraph/vtkMapperNode.cxx | 2 + Rendering/SceneGraph/vtkMapperNode.h | 2 + .../SceneGraph/vtkPolyDataMapperNode.cxx | 2 + Rendering/SceneGraph/vtkPolyDataMapperNode.h | 2 + Rendering/SceneGraph/vtkRendererNode.cxx | 2 + Rendering/SceneGraph/vtkRendererNode.h | 2 + Rendering/SceneGraph/vtkViewNode.cxx | 2 + Rendering/SceneGraph/vtkViewNode.h | 2 + Rendering/SceneGraph/vtkViewNodeFactory.cxx | 2 + Rendering/SceneGraph/vtkViewNodeFactory.h | 2 + Rendering/SceneGraph/vtkVolumeMapperNode.cxx | 2 + Rendering/SceneGraph/vtkVolumeMapperNode.h | 2 + Rendering/SceneGraph/vtkVolumeNode.cxx | 2 + Rendering/SceneGraph/vtkVolumeNode.h | 2 + Rendering/SceneGraph/vtkWindowNode.cxx | 2 + Rendering/SceneGraph/vtkWindowNode.h | 2 + Rendering/Tk/vtkCocoaTkUtilities.h | 2 + Rendering/Tk/vtkPythonTkWidgetsInit.cxx | 2 + Rendering/Tk/vtkTclUtil.h | 2 + Rendering/Tk/vtkTkAppInitConfigure.h.in | 2 + Rendering/Tk/vtkTkImageViewerWidget.cxx | 3 + Rendering/Tk/vtkTkImageViewerWidget.h | 2 + Rendering/Tk/vtkTkInternals.h.in | 4 + Rendering/Tk/vtkTkRenderWidget.h | 2 + .../UI/vtkAndroidRenderWindowInteractor.cxx | 2 + .../UI/vtkAndroidRenderWindowInteractor.h | 2 + Rendering/UI/vtkCocoaRenderWindowInteractor.h | 4 + .../UI/vtkGenericRenderWindowInteractor.cxx | 2 + .../UI/vtkGenericRenderWindowInteractor.h | 2 + Rendering/UI/vtkIOSRenderWindowInteractor.h | 2 + .../UI/vtkSDL2RenderWindowInteractor.cxx | 2 + Rendering/UI/vtkSDL2RenderWindowInteractor.h | 2 + Rendering/UI/vtkWin32HardwareWindow.cxx | 2 + Rendering/UI/vtkWin32HardwareWindow.h | 2 + .../UI/vtkWin32RenderWindowInteractor.cxx | 4 + Rendering/UI/vtkWin32RenderWindowInteractor.h | 4 + Rendering/UI/vtkXRenderWindowInteractor.cxx | 2 + Rendering/UI/vtkXRenderWindowInteractor.h | 2 + Rendering/VR/vtkOpenGLAvatar.cxx | 2 + Rendering/VR/vtkOpenGLAvatar.h | 2 + Rendering/VR/vtkVRCamera.cxx | 2 + Rendering/VR/vtkVRCamera.h | 2 + Rendering/VR/vtkVRCollaborationClient.cxx | 2 + Rendering/VR/vtkVRCollaborationClient.h | 2 + Rendering/VR/vtkVRControlsHelper.cxx | 2 + Rendering/VR/vtkVRControlsHelper.h | 2 + Rendering/VR/vtkVRFollower.cxx | 2 + Rendering/VR/vtkVRFollower.h | 2 + Rendering/VR/vtkVRHMDCamera.cxx | 2 + Rendering/VR/vtkVRHMDCamera.h | 2 + Rendering/VR/vtkVRHardwarePicker.cxx | 2 + Rendering/VR/vtkVRHardwarePicker.h | 2 + Rendering/VR/vtkVRInteractorStyle.cxx | 2 + Rendering/VR/vtkVRInteractorStyle.h | 2 + Rendering/VR/vtkVRMenuRepresentation.cxx | 2 + Rendering/VR/vtkVRMenuRepresentation.h | 2 + Rendering/VR/vtkVRMenuWidget.cxx | 2 + Rendering/VR/vtkVRMenuWidget.h | 2 + Rendering/VR/vtkVRModel.cxx | 2 + Rendering/VR/vtkVRModel.h | 2 + Rendering/VR/vtkVRPanelRepresentation.cxx | 2 + Rendering/VR/vtkVRPanelRepresentation.h | 2 + Rendering/VR/vtkVRPanelWidget.cxx | 2 + Rendering/VR/vtkVRPanelWidget.h | 2 + Rendering/VR/vtkVRRay.cxx | 2 + Rendering/VR/vtkVRRay.h | 2 + Rendering/VR/vtkVRRenderWindow.cxx | 2 + Rendering/VR/vtkVRRenderWindow.h | 2 + Rendering/VR/vtkVRRenderWindowInteractor.cxx | 2 + Rendering/VR/vtkVRRenderWindowInteractor.h | 2 + Rendering/VR/vtkVRRenderer.cxx | 2 + Rendering/VR/vtkVRRenderer.h | 2 + Rendering/Volume/vtkBlockSortHelper.h | 2 + Rendering/Volume/vtkDirectionEncoder.cxx | 2 + Rendering/Volume/vtkDirectionEncoder.h | 2 + .../Volume/vtkEncodedGradientEstimator.cxx | 2 + .../Volume/vtkEncodedGradientEstimator.h | 2 + Rendering/Volume/vtkEncodedGradientShader.cxx | 2 + Rendering/Volume/vtkEncodedGradientShader.h | 2 + .../vtkFiniteDifferenceGradientEstimator.cxx | 2 + .../vtkFiniteDifferenceGradientEstimator.h | 2 + .../Volume/vtkFixedPointRayCastImage.cxx | 2 + Rendering/Volume/vtkFixedPointRayCastImage.h | 2 + ...xedPointVolumeRayCastCompositeGOHelper.cxx | 2 + ...FixedPointVolumeRayCastCompositeGOHelper.h | 2 + ...intVolumeRayCastCompositeGOShadeHelper.cxx | 2 + ...PointVolumeRayCastCompositeGOShadeHelper.h | 2 + ...FixedPointVolumeRayCastCompositeHelper.cxx | 2 + ...tkFixedPointVolumeRayCastCompositeHelper.h | 2 + ...PointVolumeRayCastCompositeShadeHelper.cxx | 2 + ...edPointVolumeRayCastCompositeShadeHelper.h | 2 + .../vtkFixedPointVolumeRayCastHelper.cxx | 2 + .../Volume/vtkFixedPointVolumeRayCastHelper.h | 2 + .../vtkFixedPointVolumeRayCastMIPHelper.cxx | 2 + .../vtkFixedPointVolumeRayCastMIPHelper.h | 2 + .../vtkFixedPointVolumeRayCastMapper.cxx | 2 + .../Volume/vtkFixedPointVolumeRayCastMapper.h | 2 + .../Volume/vtkGPUVolumeRayCastMapper.cxx | 2 + Rendering/Volume/vtkGPUVolumeRayCastMapper.h | 2 + Rendering/Volume/vtkMultiVolume.cxx | 2 + Rendering/Volume/vtkMultiVolume.h | 2 + Rendering/Volume/vtkOSPRayVolumeInterface.cxx | 2 + Rendering/Volume/vtkOSPRayVolumeInterface.h | 2 + .../Volume/vtkProjectedTetrahedraMapper.cxx | 10 + .../Volume/vtkProjectedTetrahedraMapper.h | 2 + .../Volume/vtkRayCastImageDisplayHelper.cxx | 2 + .../Volume/vtkRayCastImageDisplayHelper.h | 2 + .../vtkRecursiveSphereDirectionEncoder.cxx | 2 + .../vtkRecursiveSphereDirectionEncoder.h | 2 + .../Volume/vtkSphericalDirectionEncoder.cxx | 2 + .../Volume/vtkSphericalDirectionEncoder.h | 2 + ...tkUnstructuredGridBunykRayCastFunction.cxx | 2 + .../vtkUnstructuredGridBunykRayCastFunction.h | 2 + ...structuredGridHomogeneousRayIntegrator.cxx | 2 + ...UnstructuredGridHomogeneousRayIntegrator.h | 2 + ...vtkUnstructuredGridLinearRayIntegrator.cxx | 2 + .../vtkUnstructuredGridLinearRayIntegrator.h | 2 + ...kUnstructuredGridPartialPreIntegration.cxx | 2 + ...vtkUnstructuredGridPartialPreIntegration.h | 2 + .../vtkUnstructuredGridPreIntegration.cxx | 2 + .../vtkUnstructuredGridPreIntegration.h | 2 + .../vtkUnstructuredGridVolumeMapper.cxx | 2 + .../Volume/vtkUnstructuredGridVolumeMapper.h | 2 + ...kUnstructuredGridVolumeRayCastFunction.cxx | 2 + ...vtkUnstructuredGridVolumeRayCastFunction.h | 2 + ...kUnstructuredGridVolumeRayCastIterator.cxx | 2 + ...vtkUnstructuredGridVolumeRayCastIterator.h | 2 + ...vtkUnstructuredGridVolumeRayCastMapper.cxx | 2 + .../vtkUnstructuredGridVolumeRayCastMapper.h | 2 + ...vtkUnstructuredGridVolumeRayIntegrator.cxx | 2 + .../vtkUnstructuredGridVolumeRayIntegrator.h | 2 + .../vtkUnstructuredGridVolumeZSweepMapper.cxx | 4 + .../vtkUnstructuredGridVolumeZSweepMapper.h | 6 + Rendering/Volume/vtkVolumeMapper.cxx | 2 + Rendering/Volume/vtkVolumeMapper.h | 2 + Rendering/Volume/vtkVolumeOutlineSource.cxx | 2 + Rendering/Volume/vtkVolumeOutlineSource.h | 2 + Rendering/Volume/vtkVolumePicker.cxx | 2 + Rendering/Volume/vtkVolumePicker.h | 2 + ...tkVolumeRayCastSpaceLeapingImageFilter.cxx | 2 + .../vtkVolumeRayCastSpaceLeapingImageFilter.h | 2 + Rendering/VolumeAMR/vtkAMRVolumeMapper.cxx | 2 + Rendering/VolumeAMR/vtkAMRVolumeMapper.h | 2 + ...MultiBlockUnstructuredGridVolumeMapper.cxx | 4 + ...tkMultiBlockUnstructuredGridVolumeMapper.h | 2 + .../vtkMultiBlockVolumeMapper.cxx | 4 + .../VolumeOpenGL2/vtkMultiBlockVolumeMapper.h | 2 + .../vtkOpenGLGPUVolumeRayCastMapper.cxx | 2 + .../vtkOpenGLGPUVolumeRayCastMapper.h | 2 + .../vtkOpenGLProjectedTetrahedraMapper.cxx | 2 + .../vtkOpenGLProjectedTetrahedraMapper.h | 2 + .../vtkOpenGLRayCastImageDisplayHelper.cxx | 2 + .../vtkOpenGLRayCastImageDisplayHelper.h | 2 + .../vtkOpenGLVolumeGradientOpacityTable.cxx | 2 + .../vtkOpenGLVolumeGradientOpacityTable.h | 2 + .../vtkOpenGLVolumeLookupTable.cxx | 2 + .../vtkOpenGLVolumeLookupTable.h | 2 + .../vtkOpenGLVolumeLookupTables.h | 2 + .../vtkOpenGLVolumeLookupTables.txx | 2 + ...eMaskGradientOpacityTransferFunction2D.cxx | 2 + ...umeMaskGradientOpacityTransferFunction2D.h | 2 + .../vtkOpenGLVolumeMaskTransferFunction2D.cxx | 2 + .../vtkOpenGLVolumeMaskTransferFunction2D.h | 2 + .../vtkOpenGLVolumeOpacityTable.cxx | 2 + .../vtkOpenGLVolumeOpacityTable.h | 2 + .../VolumeOpenGL2/vtkOpenGLVolumeRGBTable.cxx | 2 + .../VolumeOpenGL2/vtkOpenGLVolumeRGBTable.h | 2 + .../vtkOpenGLVolumeTransferFunction2D.cxx | 2 + .../vtkOpenGLVolumeTransferFunction2D.h | 2 + .../VolumeOpenGL2/vtkSmartVolumeMapper.cxx | 2 + .../VolumeOpenGL2/vtkSmartVolumeMapper.h | 2 + .../VolumeOpenGL2/vtkVolumeInputHelper.cxx | 2 + .../VolumeOpenGL2/vtkVolumeInputHelper.h | 2 + Rendering/VolumeOpenGL2/vtkVolumeMask.h | 2 + .../VolumeOpenGL2/vtkVolumeShaderComposer.h | 2 + Rendering/VolumeOpenGL2/vtkVolumeStateRAII.h | 2 + Rendering/VolumeOpenGL2/vtkVolumeTexture.cxx | 2 + Rendering/VolumeOpenGL2/vtkVolumeTexture.h | 2 + .../VtkJS/vtkVtkJSSceneGraphSerializer.cxx | 2 + .../VtkJS/vtkVtkJSSceneGraphSerializer.h | 2 + Rendering/VtkJS/vtkVtkJSViewNodeFactory.cxx | 2 + Rendering/VtkJS/vtkVtkJSViewNodeFactory.h | 2 + Testing/Core/vtkPermuteOptions.h | 2 + Testing/Core/vtkTestConditionals.txx | 2 + Testing/Core/vtkTestErrorObserver.h | 2 + Testing/Core/vtkTestUtilities.h | 2 + Testing/Core/vtkTestingColors.h | 2 + Testing/Core/vtkWindowsTestUtilities.h | 4 + .../vtkMappedUnstructuredGridGenerator.cxx | 3 + .../vtkMappedUnstructuredGridGenerator.h | 2 + Testing/GenericBridge/vtkBridgeAttribute.cxx | 2 + Testing/GenericBridge/vtkBridgeAttribute.h | 2 + Testing/GenericBridge/vtkBridgeCell.cxx | 2 + Testing/GenericBridge/vtkBridgeCell.h | 2 + .../GenericBridge/vtkBridgeCellIterator.cxx | 2 + Testing/GenericBridge/vtkBridgeCellIterator.h | 2 + .../vtkBridgeCellIteratorOnCellBoundaries.cxx | 2 + .../vtkBridgeCellIteratorOnCellBoundaries.h | 2 + .../vtkBridgeCellIteratorOnCellList.cxx | 2 + .../vtkBridgeCellIteratorOnCellList.h | 2 + .../vtkBridgeCellIteratorOnDataSet.cxx | 2 + .../vtkBridgeCellIteratorOnDataSet.h | 2 + .../vtkBridgeCellIteratorOne.cxx | 2 + .../GenericBridge/vtkBridgeCellIteratorOne.h | 2 + .../vtkBridgeCellIteratorStrategy.cxx | 2 + .../vtkBridgeCellIteratorStrategy.h | 2 + Testing/GenericBridge/vtkBridgeDataSet.cxx | 2 + Testing/GenericBridge/vtkBridgeDataSet.h | 2 + .../GenericBridge/vtkBridgePointIterator.cxx | 2 + .../GenericBridge/vtkBridgePointIterator.h | 2 + .../vtkBridgePointIteratorOnCell.cxx | 2 + .../vtkBridgePointIteratorOnCell.h | 2 + .../vtkBridgePointIteratorOnDataSet.cxx | 2 + .../vtkBridgePointIteratorOnDataSet.h | 2 + .../vtkBridgePointIteratorOne.cxx | 2 + .../GenericBridge/vtkBridgePointIteratorOne.h | 2 + Testing/IOSQL/DatabaseSchemaWith2Tables.cxx | 2 + Testing/IOSQL/DatabaseSchemaWith2Tables.h | 2 + .../vtkMultiBaselineRegressionTest.h | 2 + Testing/Rendering/vtkRegressionTestImage.h | 2 + Testing/Rendering/vtkTesting.cxx | 2 + Testing/Rendering/vtkTesting.h | 2 + Testing/Rendering/vtkTestingInteractor.cxx | 2 + Testing/Rendering/vtkTestingInteractor.h | 2 + Testing/Rendering/vtkTestingObjectFactory.cxx | 2 + Testing/Rendering/vtkTestingObjectFactory.h | 2 + Utilities/Benchmarks/vtkRenderTimingTests.h | 12 + Utilities/Benchmarks/vtkRenderTimings.cxx | 2 + Utilities/Benchmarks/vtkRenderTimings.h | 2 + Utilities/DICOMParser/DICOMAppHelper.cxx | 2 + Utilities/DICOMParser/DICOMAppHelper.h | 2 + Utilities/DICOMParser/DICOMCallback.h | 2 + Utilities/DICOMParser/DICOMConfig.h | 2 + Utilities/DICOMParser/DICOMFile.cxx | 2 + Utilities/DICOMParser/DICOMFile.h | 2 + Utilities/DICOMParser/DICOMParser.cxx | 2 + Utilities/DICOMParser/DICOMParser.h | 2 + Utilities/DICOMParser/DICOMParserMap.h | 2 + Utilities/DICOMParser/vtk.module | 1 + Utilities/Java/vtkJavaAwt.h | 6 + Utilities/Java/vtkJavaUtil.cxx | 1 + Utilities/Java/vtkJavaUtil.h | 2 + Utilities/Python/vtkPython.h | 2 + .../vtkPythonInteractiveInterpreter.cxx | 2 + .../vtkPythonInteractiveInterpreter.h | 2 + .../vtkPythonInterpreter.cxx | 3 +- .../PythonInterpreter/vtkPythonInterpreter.h | 2 + .../vtkPythonStdStreamCaptureHelper.h | 2 + Utilities/octree/octree/octree.h | 2 + Utilities/octree/octree/octree.txx | 2 + Utilities/octree/octree/octree_cursor.h | 2 + Utilities/octree/octree/octree_cursor.txx | 2 + Utilities/octree/octree/octree_iterator.h | 2 + Utilities/octree/octree/octree_iterator.txx | 2 + Utilities/octree/octree/octree_node.h | 2 + Utilities/octree/octree/octree_node.txx | 2 + Utilities/octree/octree/octree_path.h | 2 + Utilities/octree/octree/octree_path.txx | 2 + Views/Context2D/vtkContextInteractorStyle.cxx | 2 + Views/Context2D/vtkContextInteractorStyle.h | 2 + Views/Context2D/vtkContextView.cxx | 2 + Views/Context2D/vtkContextView.h | 2 + Views/Core/vtkConvertSelectionDomain.cxx | 2 + Views/Core/vtkConvertSelectionDomain.h | 2 + Views/Core/vtkDataRepresentation.cxx | 2 + Views/Core/vtkDataRepresentation.h | 2 + Views/Core/vtkEmptyRepresentation.cxx | 2 + Views/Core/vtkEmptyRepresentation.h | 2 + Views/Core/vtkRenderViewBase.cxx | 2 + Views/Core/vtkRenderViewBase.h | 2 + Views/Core/vtkView.cxx | 2 + Views/Core/vtkView.h | 2 + Views/Core/vtkViewTheme.cxx | 2 + Views/Core/vtkViewTheme.h | 2 + Views/Infovis/vtkApplyColors.cxx | 2 + Views/Infovis/vtkApplyColors.h | 2 + Views/Infovis/vtkApplyIcons.cxx | 2 + Views/Infovis/vtkApplyIcons.h | 2 + Views/Infovis/vtkDendrogramItem.cxx | 2 + Views/Infovis/vtkDendrogramItem.h | 2 + Views/Infovis/vtkGraphItem.cxx | 2 + Views/Infovis/vtkGraphItem.h | 2 + Views/Infovis/vtkGraphLayoutView.cxx | 2 + Views/Infovis/vtkGraphLayoutView.h | 2 + Views/Infovis/vtkHeatmapItem.cxx | 2 + Views/Infovis/vtkHeatmapItem.h | 2 + .../Infovis/vtkHierarchicalGraphPipeline.cxx | 2 + Views/Infovis/vtkHierarchicalGraphPipeline.h | 2 + Views/Infovis/vtkHierarchicalGraphView.cxx | 2 + Views/Infovis/vtkHierarchicalGraphView.h | 2 + Views/Infovis/vtkIcicleView.cxx | 2 + Views/Infovis/vtkIcicleView.h | 2 + .../vtkInteractorStyleAreaSelectHover.cxx | 2 + .../vtkInteractorStyleAreaSelectHover.h | 2 + .../vtkInteractorStyleTreeMapHover.cxx | 2 + .../Infovis/vtkInteractorStyleTreeMapHover.h | 2 + ...llelCoordinatesHistogramRepresentation.cxx | 2 + ...rallelCoordinatesHistogramRepresentation.h | 2 + .../vtkParallelCoordinatesRepresentation.cxx | 2 + .../vtkParallelCoordinatesRepresentation.h | 2 + Views/Infovis/vtkParallelCoordinatesView.cxx | 2 + Views/Infovis/vtkParallelCoordinatesView.h | 2 + Views/Infovis/vtkRenderView.cxx | 2 + Views/Infovis/vtkRenderView.h | 2 + .../vtkRenderedGraphRepresentation.cxx | 2 + .../Infovis/vtkRenderedGraphRepresentation.h | 2 + .../vtkRenderedHierarchyRepresentation.cxx | 2 + .../vtkRenderedHierarchyRepresentation.h | 2 + Views/Infovis/vtkRenderedRepresentation.cxx | 2 + Views/Infovis/vtkRenderedRepresentation.h | 2 + .../vtkRenderedSurfaceRepresentation.cxx | 2 + .../vtkRenderedSurfaceRepresentation.h | 2 + .../vtkRenderedTreeAreaRepresentation.cxx | 2 + .../vtkRenderedTreeAreaRepresentation.h | 2 + Views/Infovis/vtkSCurveSpline.cxx | 2 + Views/Infovis/vtkSCurveSpline.h | 2 + Views/Infovis/vtkTanglegramItem.cxx | 2 + Views/Infovis/vtkTanglegramItem.h | 2 + Views/Infovis/vtkTreeAreaView.cxx | 2 + Views/Infovis/vtkTreeAreaView.h | 2 + Views/Infovis/vtkTreeHeatmapItem.cxx | 2 + Views/Infovis/vtkTreeHeatmapItem.h | 2 + Views/Infovis/vtkTreeMapView.cxx | 2 + Views/Infovis/vtkTreeMapView.h | 2 + Views/Infovis/vtkTreeRingView.cxx | 2 + Views/Infovis/vtkTreeRingView.h | 2 + Views/Infovis/vtkViewUpdater.cxx | 2 + Views/Infovis/vtkViewUpdater.h | 2 + Views/Qt/vtkQtAnnotationView.cxx | 2 + Views/Qt/vtkQtAnnotationView.h | 6 +- Views/Qt/vtkQtListView.cxx | 2 + Views/Qt/vtkQtListView.h | 7 +- Views/Qt/vtkQtRecordView.cxx | 2 + Views/Qt/vtkQtRecordView.h | 3 + Views/Qt/vtkQtTableRepresentation.cxx | 2 + Views/Qt/vtkQtTableRepresentation.h | 2 + Views/Qt/vtkQtTableView.cxx | 2 + Views/Qt/vtkQtTableView.h | 9 +- Views/Qt/vtkQtTreeView.cxx | 2 + Views/Qt/vtkQtTreeView.h | 9 +- Views/Qt/vtkQtView.cxx | 2 + Views/Qt/vtkQtView.h | 2 + Web/Core/vtkDataEncoder.cxx | 4 + Web/Core/vtkDataEncoder.h | 2 + Web/Core/vtkObjectIdMap.cxx | 2 + Web/Core/vtkObjectIdMap.h | 2 + Web/Core/vtkWebApplication.cxx | 2 + Web/Core/vtkWebApplication.h | 2 + Web/Core/vtkWebInteractionEvent.cxx | 2 + Web/Core/vtkWebInteractionEvent.h | 2 + Web/Core/vtkWebUtilities.cxx | 2 + Web/Core/vtkWebUtilities.h | 2 + Web/WebGLExporter/vtkPVWebGLExporter.cxx | 2 + Web/WebGLExporter/vtkPVWebGLExporter.h | 2 + Web/WebGLExporter/vtkWebGLDataSet.cxx | 2 + Web/WebGLExporter/vtkWebGLDataSet.h | 2 + Web/WebGLExporter/vtkWebGLExporter.cxx | 2 + Web/WebGLExporter/vtkWebGLExporter.h | 9 +- Web/WebGLExporter/vtkWebGLObject.cxx | 4 + Web/WebGLExporter/vtkWebGLObject.h | 2 + Web/WebGLExporter/vtkWebGLPolyData.cxx | 2 + Web/WebGLExporter/vtkWebGLPolyData.h | 2 + Web/WebGLExporter/vtkWebGLWidget.cxx | 2 + Web/WebGLExporter/vtkWebGLWidget.h | 2 + Wrapping/PythonCore/PyVTKEnum.cxx | 1 + Wrapping/PythonCore/PyVTKEnum.h | 1 + Wrapping/PythonCore/PyVTKExtras.cxx | 1 + Wrapping/PythonCore/PyVTKExtras.h | 1 + Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 1 + Wrapping/PythonCore/PyVTKMethodDescriptor.h | 1 + Wrapping/PythonCore/PyVTKNamespace.cxx | 1 + Wrapping/PythonCore/PyVTKNamespace.h | 1 + Wrapping/PythonCore/PyVTKObject.cxx | 3 + Wrapping/PythonCore/PyVTKObject.h | 5 + Wrapping/PythonCore/PyVTKReference.cxx | 1 + Wrapping/PythonCore/PyVTKReference.h | 1 + Wrapping/PythonCore/PyVTKSpecialObject.cxx | 3 + Wrapping/PythonCore/PyVTKSpecialObject.h | 3 + Wrapping/PythonCore/PyVTKTemplate.cxx | 1 + Wrapping/PythonCore/PyVTKTemplate.h | 1 + Wrapping/PythonCore/vtkPythonArgs.cxx | 3 + Wrapping/PythonCore/vtkPythonArgs.h | 4 + Wrapping/PythonCore/vtkPythonCommand.cxx | 3 + Wrapping/PythonCore/vtkPythonCommand.h | 3 + Wrapping/PythonCore/vtkPythonOverload.cxx | 3 + Wrapping/PythonCore/vtkPythonOverload.h | 3 + Wrapping/PythonCore/vtkPythonUtil.cxx | 3 + Wrapping/PythonCore/vtkPythonUtil.h | 11 +- Wrapping/PythonCore/vtkSmartPyObject.cxx | 3 + Wrapping/PythonCore/vtkSmartPyObject.h | 3 + 5882 files changed, 13774 insertions(+), 319 deletions(-) create mode 100644 Filters/Parallel/vtkHyperTreeGridPProbeFilter.cxx create mode 100644 Geovis/Core/vtkCompassWidget.cxx diff --git a/Accelerators/Vtkm/Core/vtkmDataArray.cxx b/Accelerators/Vtkm/Core/vtkmDataArray.cxx index 6e2aa0600a..dec8a274f8 100644 --- a/Accelerators/Vtkm/Core/vtkmDataArray.cxx +++ b/Accelerators/Vtkm/Core/vtkmDataArray.cxx @@ -21,6 +21,7 @@ #include "vtkmDataArray.h" +VTK_ABI_NAMESPACE_BEGIN template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray; template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray; template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray; @@ -34,3 +35,4 @@ template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray; template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray; template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray; template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray; +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Core/vtkmDataArray.h b/Accelerators/Vtkm/Core/vtkmDataArray.h index 4db1057565..5ebd3f77b2 100644 --- a/Accelerators/Vtkm/Core/vtkmDataArray.h +++ b/Accelerators/Vtkm/Core/vtkmDataArray.h @@ -34,12 +34,15 @@ namespace internal { +VTK_ABI_NAMESPACE_BEGIN template class ArrayHandleWrapperBase; +VTK_ABI_NAMESPACE_END } // internal +VTK_ABI_NAMESPACE_BEGIN template class vtkmDataArray : public vtkGenericDataArray, T> { @@ -116,6 +119,7 @@ extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT vtkmDataArray; #endif // vtkmDataArray_cxx +VTK_ABI_NAMESPACE_END #endif // vtkmDataArray_h #include "vtkmlib/vtkmDataArray.hxx" diff --git a/Accelerators/Vtkm/Core/vtkmFilterPolicy.h b/Accelerators/Vtkm/Core/vtkmFilterPolicy.h index 0d74e0a4bd..fb8cce1442 100644 --- a/Accelerators/Vtkm/Core/vtkmFilterPolicy.h +++ b/Accelerators/Vtkm/Core/vtkmFilterPolicy.h @@ -30,6 +30,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN class vtkmOutputFilterPolicy : public vtkm::filter::PolicyBase { public: @@ -40,5 +41,6 @@ public: using AllCellSetList = tovtkm::CellListAllOutVTK; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkmFilterPolicy.h diff --git a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.cxx b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.cxx index 89b5495201..6ede3e2cd6 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.cxx +++ b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.cxx @@ -28,6 +28,7 @@ namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -212,4 +213,5 @@ vtkPoints* Convert(const vtkm::cont::CoordinateSystem& input) return points; } +VTK_ABI_NAMESPACE_END } diff --git a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h index da27b10a9b..10a7c0c4cb 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h +++ b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h @@ -29,9 +29,6 @@ #include // for std::underlying_type -class vtkDataArray; -class vtkPoints; - namespace vtkm { namespace cont @@ -40,8 +37,14 @@ class CoordinateSystem; } } +VTK_ABI_NAMESPACE_BEGIN +class vtkDataArray; +class vtkPoints; +VTK_ABI_NAMESPACE_END + namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN /// Temporary name for arrays converted from VTK that do not have a name. /// Unnamed arrays seem to be supported by VTK, but VTK-m requires all fields to have a name. @@ -114,10 +117,12 @@ enum class FieldsFlag PointsAndCells = Points | Cells }; +VTK_ABI_NAMESPACE_END } namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMCORE_EXPORT vtkDataArray* Convert(const vtkm::cont::Field& input); @@ -128,8 +133,10 @@ vtkDataArray* Convert(const vtkm::cont::UnknownArrayHandle& input, const char* n VTKACCELERATORSVTKMCORE_EXPORT vtkPoints* Convert(const vtkm::cont::CoordinateSystem& input); +VTK_ABI_NAMESPACE_END } +VTK_ABI_NAMESPACE_BEGIN inline tovtkm::FieldsFlag operator&(const tovtkm::FieldsFlag& a, const tovtkm::FieldsFlag& b) { using T = std::underlying_type::type; @@ -141,5 +148,7 @@ inline tovtkm::FieldsFlag operator|(const tovtkm::FieldsFlag& a, const tovtkm::F using T = std::underlying_type::type; return static_cast(static_cast(a) | static_cast(b)); } +VTK_ABI_NAMESPACE_END #endif // vtkmlib_ArrayConverters_h +/* VTK-HeaderTest-Exclude: DataArrayConverters.h */ diff --git a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.hxx b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.hxx index 531c23a5d3..1ccea454f4 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.hxx +++ b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.hxx @@ -25,6 +25,7 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN template vtkm::cont::UnknownArrayHandle vtkDataArrayToUnknownArrayHandle(DataArrayType* input) @@ -82,5 +83,6 @@ vtkm::cont::Field ConvertCellField(DataArrayType* input) return vtkm::cont::make_FieldCell(name, vhandle); } +VTK_ABI_NAMESPACE_END } // tovtkm #endif diff --git a/Accelerators/Vtkm/Core/vtkmlib/PortalTraits.h b/Accelerators/Vtkm/Core/vtkmlib/PortalTraits.h index e536cf4bca..10e02c6ba9 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/PortalTraits.h +++ b/Accelerators/Vtkm/Core/vtkmlib/PortalTraits.h @@ -26,6 +26,7 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN struct vtkPortalOfVecOfVecValues; struct vtkPortalOfVecOfValues; @@ -142,6 +143,7 @@ struct vtkPortalTraits, M>> } }; +VTK_ABI_NAMESPACE_END } // namespace vtkmlib #endif // vtkmlib_PortalsTraits_h diff --git a/Accelerators/Vtkm/Core/vtkmlib/Portals.cxx b/Accelerators/Vtkm/Core/vtkmlib/Portals.cxx index 4a65a3b61e..02c34ee63b 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/Portals.cxx +++ b/Accelerators/Vtkm/Core/vtkmlib/Portals.cxx @@ -21,9 +21,11 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN // T extern template instantiations template class VTKACCELERATORSVTKMCORE_EXPORT vtkPointsPortal const>; template class VTKACCELERATORSVTKMCORE_EXPORT vtkPointsPortal const>; template class VTKACCELERATORSVTKMCORE_EXPORT vtkPointsPortal>; template class VTKACCELERATORSVTKMCORE_EXPORT vtkPointsPortal>; +VTK_ABI_NAMESPACE_END } diff --git a/Accelerators/Vtkm/Core/vtkmlib/Portals.h b/Accelerators/Vtkm/Core/vtkmlib/Portals.h index 42f4de92eb..776764a6bf 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/Portals.h +++ b/Accelerators/Vtkm/Core/vtkmlib/Portals.h @@ -21,13 +21,16 @@ #include "vtkAcceleratorsVTKmCoreModule.h" #include "vtkmConfigCore.h" //required for general vtkm setup +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkPoints; +VTK_ABI_NAMESPACE_END #include namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN template class VTKM_ALWAYS_EXPORT vtkArrayPortal @@ -116,12 +119,14 @@ private: ComponentType* Array; vtkm::Id Size; }; +VTK_ABI_NAMESPACE_END } #ifndef vtkmlib_Portals_cxx #include namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN // T extern template instantiations extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT vtkPointsPortal const>; @@ -131,9 +136,11 @@ extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT vtkPointsPortal>; extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT vtkPointsPortal>; +VTK_ABI_NAMESPACE_END } #endif // defined vtkmlib_Portals_cxx #include "Portals.hxx" #endif // vtkmlib_Portals_h +/* VTK-HeaderTest-Exclude: Portals.h */ diff --git a/Accelerators/Vtkm/Core/vtkmlib/Portals.hxx b/Accelerators/Vtkm/Core/vtkmlib/Portals.hxx index b017019be7..ae74b94332 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/Portals.hxx +++ b/Accelerators/Vtkm/Core/vtkmlib/Portals.hxx @@ -52,6 +52,7 @@ struct fillComponents<1> namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ template @@ -136,6 +137,7 @@ VTKM_EXEC void vtkPointsPortal::Set(vtkm::Id index, const ValueType& value // use template magic to auto unroll insertion fillComponents()(rawArray, value); } +VTK_ABI_NAMESPACE_END } #endif // vtkmlib_Portals_hxx diff --git a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx index bcef2e3fd0..4db4e1533d 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx +++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx @@ -31,6 +31,7 @@ namespace internal { +VTK_ABI_NAMESPACE_BEGIN //============================================================================= template class ArrayHandleWrapperBase @@ -408,8 +409,10 @@ ArrayHandleWrapperBase* MakeArrayHandleWrapper(vtkIdType numberOfTuples, int } } +VTK_ABI_NAMESPACE_END } // internal +VTK_ABI_NAMESPACE_BEGIN //============================================================================= template vtkmDataArray::vtkmDataArray() = default; @@ -504,4 +507,5 @@ bool vtkmDataArray::ReallocateTuples(vtkIdType numTuples) return true; } +VTK_ABI_NAMESPACE_END #endif // vtkmDataArray_hxx diff --git a/Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.cxx b/Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.cxx index f209e85183..2d3952dda1 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.cxx +++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.cxx @@ -17,6 +17,7 @@ #include "vtkmInitializer.h" #include +VTK_ABI_NAMESPACE_BEGIN void InitializeVTKm() { // Only Kokkos HIP backend needs to be initialized @@ -36,3 +37,4 @@ vtkmInitializer::vtkmInitializer() { (void)InitializeVTKm(); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.h b/Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.h index 84e8fd9159..65c7013b74 100644 --- a/Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.h +++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.h @@ -19,9 +19,11 @@ #include "vtkAcceleratorsVTKmCoreModule.h" +VTK_ABI_NAMESPACE_BEGIN struct VTKACCELERATORSVTKMCORE_EXPORT vtkmInitializer { vtkmInitializer(); }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Accelerators/Vtkm/DataModel/vtkmConfigDataModel.h.in b/Accelerators/Vtkm/DataModel/vtkmConfigDataModel.h.in index ad440eb8e5..7fedd32062 100644 --- a/Accelerators/Vtkm/DataModel/vtkmConfigDataModel.h.in +++ b/Accelerators/Vtkm/DataModel/vtkmConfigDataModel.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef vtkConfigDataModel_h -#define vtkConfigDataModel_h +#ifndef vtkmConfigDataModel_h +#define vtkmConfigDataModel_h /*--------------------------------------------------------------------------*/ /* Other Configuration Options */ @@ -52,4 +52,4 @@ #endif -#endif // vtkConfigDataModel_h +#endif // vtkmConfigDataModel_h diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx index 626b7d2f04..e2b118979b 100644 --- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx @@ -40,6 +40,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -437,3 +438,4 @@ void vtkmDataSet::DeepCopy(vtkDataObject* src) } } } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.h b/Accelerators/Vtkm/DataModel/vtkmDataSet.h index 940fb02903..9d3a7f92bc 100644 --- a/Accelerators/Vtkm/DataModel/vtkmDataSet.h +++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.h @@ -36,6 +36,8 @@ class DataSet; } } // vtkm::cont +VTK_ABI_NAMESPACE_BEGIN + class vtkPoints; class vtkCell; class vtkGenericCell; @@ -195,4 +197,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmDataSet_h diff --git a/Accelerators/Vtkm/DataModel/vtkmFilterPolicy.h b/Accelerators/Vtkm/DataModel/vtkmFilterPolicy.h index 996748c992..072ae9d5ca 100644 --- a/Accelerators/Vtkm/DataModel/vtkmFilterPolicy.h +++ b/Accelerators/Vtkm/DataModel/vtkmFilterPolicy.h @@ -30,6 +30,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN class vtkmOutputFilterPolicy : public vtkm::filter::PolicyBase { public: @@ -40,5 +41,6 @@ public: using AllCellSetList = tovtkm::CellListAllOutVTK; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkmFilterPolicy.h diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.cxx index 668f0c1a42..6a1770f98b 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.cxx @@ -32,6 +32,7 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN void ProcessFields(vtkDataSet* input, vtkm::cont::DataSet& dataset, tovtkm::FieldsFlag fields) { if ((fields & tovtkm::FieldsFlag::Points) != tovtkm::FieldsFlag::None) @@ -125,10 +126,12 @@ vtkm::cont::Field Convert(vtkDataArray* input, int association) } return field; } +VTK_ABI_NAMESPACE_END } // namespace tovtkm namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN bool ConvertArrays(const vtkm::cont::DataSet& input, vtkDataSet* output) { @@ -157,4 +160,5 @@ bool ConvertArrays(const vtkm::cont::DataSet& input, vtkDataSet* output) } return true; } +VTK_ABI_NAMESPACE_END } // namespace fromvtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.h b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.h index f4837476c8..1aa4156b51 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.h +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.h @@ -30,10 +30,6 @@ #include // for std::underlying_type -class vtkDataArray; -class vtkDataSet; -class vtkPoints; - namespace vtkm { namespace cont @@ -43,8 +39,15 @@ class CoordinateSystem; } } +VTK_ABI_NAMESPACE_BEGIN +class vtkDataArray; +class vtkDataSet; +class vtkPoints; +VTK_ABI_NAMESPACE_END + namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT void ProcessFields(vtkDataSet* input, vtkm::cont::DataSet& dataset, tovtkm::FieldsFlag fields); @@ -52,13 +55,16 @@ void ProcessFields(vtkDataSet* input, vtkm::cont::DataSet& dataset, tovtkm::Fiel // determine the type and call the proper Convert routine VTKACCELERATORSVTKMDATAMODEL_EXPORT vtkm::cont::Field Convert(vtkDataArray* input, int association); +VTK_ABI_NAMESPACE_END } namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT bool ConvertArrays(const vtkm::cont::DataSet& input, vtkDataSet* output); +VTK_ABI_NAMESPACE_END } #endif // vtkmlib_ArrayConverters_h diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.hxx b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.hxx index bae3b0c659..d5af0912f7 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.hxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.hxx @@ -27,6 +27,7 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN template vtkm::cont::Field Convert(DataArrayType* input, int association) @@ -89,5 +90,6 @@ VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM(vtkSOADataArrayTemplate) #endif // !defined(ArrayConverterExport_cxx) +VTK_ABI_NAMESPACE_END } // tovtkm #endif diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersReal.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersReal.cxx index d7d681b3b8..1a34d9c668 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersReal.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersReal.cxx @@ -19,8 +19,10 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN VTK_EXPORT_REAL_ARRAY_CONVERSION_TO_VTKM(vtkAOSDataArrayTemplate) VTK_EXPORT_REAL_ARRAY_CONVERSION_TO_VTKM(vtkSOADataArrayTemplate) +VTK_ABI_NAMESPACE_END } // tovtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersSigned.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersSigned.cxx index 9242322582..1a0a5bb006 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersSigned.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersSigned.cxx @@ -19,8 +19,10 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN VTK_EXPORT_SIGNED_ARRAY_CONVERSION_TO_VTKM(vtkAOSDataArrayTemplate) VTK_EXPORT_SIGNED_ARRAY_CONVERSION_TO_VTKM(vtkSOADataArrayTemplate) +VTK_ABI_NAMESPACE_END } // tovtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersUnsigned.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersUnsigned.cxx index 93088b8e47..ea05ceb999 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersUnsigned.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersUnsigned.cxx @@ -19,8 +19,10 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN VTK_EXPORT_UNSIGNED_ARRAY_CONVERSION_TO_VTKM(vtkAOSDataArrayTemplate) VTK_EXPORT_UNSIGNED_ARRAY_CONVERSION_TO_VTKM(vtkSOADataArrayTemplate) +VTK_ABI_NAMESPACE_END } // tovtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.cxx index ad86752267..4033aae2d6 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.cxx @@ -46,6 +46,7 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -228,10 +229,12 @@ vtkm::cont::UnknownCellSet Convert( return cells->Visit(BuildExplicitCellSetVisitor{}, ShapeConverter::Wrap(types), numberOfPoints); } +VTK_ABI_NAMESPACE_END } // namespace tovtkm namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN bool Convert(const vtkm::cont::UnknownCellSet& toConvert, vtkCellArray* cells, vtkUnsignedCharArray* typesArray) @@ -285,4 +288,5 @@ bool Convert(const vtkm::cont::UnknownCellSet& toConvert, vtkCellArray* cells, return true; } +VTK_ABI_NAMESPACE_END } // namespace fromvtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.h b/Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.h index 96108d67d3..563af91fe3 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.h +++ b/Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.h @@ -23,12 +23,15 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkUnsignedCharArray; class vtkIdTypeArray; +VTK_ABI_NAMESPACE_END namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT vtkm::cont::UnknownCellSet ConvertSingleType( vtkCellArray* cells, int cellType, vtkIdType numberOfPoints); @@ -36,14 +39,17 @@ vtkm::cont::UnknownCellSet ConvertSingleType( VTKACCELERATORSVTKMDATAMODEL_EXPORT vtkm::cont::UnknownCellSet Convert( vtkUnsignedCharArray* types, vtkCellArray* cells, vtkIdType numberOfPoints); +VTK_ABI_NAMESPACE_END } namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT bool Convert(const vtkm::cont::UnknownCellSet& toConvert, vtkCellArray* cells, vtkUnsignedCharArray* types = nullptr); +VTK_ABI_NAMESPACE_END } #endif // vtkmlib_CellSetConverters_h diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx index 955835a68a..4d5705892b 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx @@ -47,6 +47,7 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -281,10 +282,12 @@ vtkm::cont::DataSet Convert(vtkDataSet* input, FieldsFlag fields) } } +VTK_ABI_NAMESPACE_END } // namespace tovtkm namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -440,4 +443,5 @@ bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkStructuredGrid* output, vtkD return true; } +VTK_ABI_NAMESPACE_END } // namespace fromvtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.h b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.h index 2dfdff22f4..bcdb8e29a1 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.h +++ b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.h @@ -25,15 +25,18 @@ #include +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class vtkDataSetAttributes; class vtkImageData; class vtkPoints; class vtkRectilinearGrid; class vtkStructuredGrid; +VTK_ABI_NAMESPACE_END namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN // convert a vtkPoints array into a coordinate system VTKACCELERATORSVTKMDATAMODEL_EXPORT @@ -50,10 +53,12 @@ vtkm::cont::DataSet Convert(vtkRectilinearGrid* input, FieldsFlag fields); // determine the type and call the proper Convert routine VTKACCELERATORSVTKMDATAMODEL_EXPORT vtkm::cont::DataSet Convert(vtkDataSet* input, FieldsFlag fields = FieldsFlag::None); +VTK_ABI_NAMESPACE_END } namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT void PassAttributesInformation(vtkDataSetAttributes* input, vtkDataSetAttributes* output); @@ -64,6 +69,7 @@ bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkRectilinearGrid* output, vtk VTKACCELERATORSVTKMDATAMODEL_EXPORT bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkStructuredGrid* output, vtkDataSet* input); +VTK_ABI_NAMESPACE_END } #endif // vtkmlib_DataSetConverters_h diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx index d1c6ba59d5..c3ace1530d 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx @@ -76,6 +76,7 @@ struct SetGlobalPointIndexStart namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // convert an image data type @@ -110,10 +111,12 @@ vtkm::cont::DataSet Convert(vtkImageData* input, FieldsFlag fields) return dataset; } +VTK_ABI_NAMESPACE_END } // tovtkm namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN bool Convert( const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* output, vtkDataSet* input) @@ -172,4 +175,5 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSe return Convert(voutput, extents, output, input); } +VTK_ABI_NAMESPACE_END } // fromvtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.h b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.h index 67d4053942..6ffe8ec612 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.h +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.h @@ -23,19 +23,24 @@ #include +VTK_ABI_NAMESPACE_BEGIN class vtkImageData; class vtkDataSet; +VTK_ABI_NAMESPACE_END namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT vtkm::cont::DataSet Convert(vtkImageData* input, FieldsFlag fields = FieldsFlag::None); +VTK_ABI_NAMESPACE_END } namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSet* input); @@ -44,5 +49,6 @@ VTKACCELERATORSVTKMDATAMODEL_EXPORT bool Convert( const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* output, vtkDataSet* input); +VTK_ABI_NAMESPACE_END } #endif // vtkmlib_ImageDataConverter_h diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx index 814af43cc1..6f27a7de13 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx @@ -26,6 +26,7 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN inline vtkm::Vec MakeFVec3(const double x[3]) { @@ -141,4 +142,5 @@ const vtkm::ImplicitFunctionGeneral& ImplicitFunctionConverter::Get() return this->OutFunction; } +VTK_ABI_NAMESPACE_END } // tovtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h index a1a571c93d..d12e2c3ccf 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h +++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h @@ -22,10 +22,13 @@ #include "vtkm/ImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkImplicitFunction; +VTK_ABI_NAMESPACE_END namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMDATAMODEL_EXPORT ImplicitFunctionConverter { @@ -41,6 +44,7 @@ private: mutable vtkMTimeType MTime; }; +VTK_ABI_NAMESPACE_END } #endif // vtkmlib_ImplicitFunctionConverter_h diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.cxx index 1c15de506d..19a5b41da2 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.cxx @@ -39,6 +39,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN namespace { struct build_type_array @@ -68,8 +69,10 @@ struct build_type_array } }; } +VTK_ABI_NAMESPACE_END namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // convert an polydata type @@ -174,10 +177,12 @@ vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields) return dataset; } +VTK_ABI_NAMESPACE_END } // namespace tovtkm namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, vtkDataSet* input) @@ -209,4 +214,5 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, vtkDataSet return arraysConverted; } +VTK_ABI_NAMESPACE_END } // namespace fromvtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.h b/Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.h index dcadf33cb8..dc239139ff 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.h +++ b/Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.h @@ -25,19 +25,25 @@ #include +VTK_ABI_NAMESPACE_BEGIN class vtkPolyData; class vtkDataSet; +VTK_ABI_NAMESPACE_END namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN // convert an polydata type VTKACCELERATORSVTKMDATAMODEL_EXPORT vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields = FieldsFlag::None); +VTK_ABI_NAMESPACE_END } namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, vtkDataSet* input); +VTK_ABI_NAMESPACE_END } #endif // vtkmlib_PolyDataConverter_h diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.cxx index 3b084f0b0f..4f02fb88a7 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.cxx +++ b/Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.cxx @@ -41,6 +41,7 @@ namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // convert an unstructured grid type @@ -74,10 +75,12 @@ vtkm::cont::DataSet Convert(vtkUnstructuredGrid* input, FieldsFlag fields) return dataset; } +VTK_ABI_NAMESPACE_END } // namespace tovtkm namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vtkDataSet* input) @@ -118,4 +121,5 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vt return arraysConverted; } +VTK_ABI_NAMESPACE_END } // namespace fromvtkm diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.h b/Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.h index 595604bcd1..8d693a6d2e 100644 --- a/Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.h +++ b/Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.h @@ -25,20 +25,26 @@ #include +VTK_ABI_NAMESPACE_BEGIN class vtkUnstructuredGrid; class vtkDataSet; +VTK_ABI_NAMESPACE_END namespace tovtkm { +VTK_ABI_NAMESPACE_BEGIN // convert an unstructured grid type VTKACCELERATORSVTKMDATAMODEL_EXPORT vtkm::cont::DataSet Convert(vtkUnstructuredGrid* input, FieldsFlag fields = FieldsFlag::None); +VTK_ABI_NAMESPACE_END } namespace fromvtkm { +VTK_ABI_NAMESPACE_BEGIN VTKACCELERATORSVTKMDATAMODEL_EXPORT bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vtkDataSet* input); +VTK_ABI_NAMESPACE_END } #endif // vtkmlib_UnstructuredGridConverter_h diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx index 85e7ce6d32..23bd44edb2 100644 --- a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx +++ b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx @@ -30,6 +30,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmAverageToCells); //------------------------------------------------------------------------------ @@ -169,3 +170,4 @@ void vtkmAverageToCells::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToCells.h b/Accelerators/Vtkm/Filters/vtkmAverageToCells.h index c24e8a94aa..1dae231fc0 100644 --- a/Accelerators/Vtkm/Filters/vtkmAverageToCells.h +++ b/Accelerators/Vtkm/Filters/vtkmAverageToCells.h @@ -32,6 +32,7 @@ #include "vtkPointDataToCellData.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmAverageToCells : public vtkPointDataToCellData { public: @@ -51,4 +52,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmAverageToCells_h diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx index 536ec8cdd5..5e81a8e753 100644 --- a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx +++ b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx @@ -35,6 +35,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmAverageToPoints); //------------------------------------------------------------------------------ @@ -181,3 +182,4 @@ void vtkmAverageToPoints::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.h b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.h index b40650a916..cce961b78a 100644 --- a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.h +++ b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.h @@ -31,6 +31,7 @@ #include "vtkCellDataToPointData.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmAverageToPoints : public vtkCellDataToPointData { public: @@ -50,4 +51,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmAverageToPoints_h diff --git a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx index 360adc9542..5c887e731f 100644 --- a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx +++ b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx @@ -31,6 +31,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmCleanGrid); //------------------------------------------------------------------------------ @@ -100,3 +101,4 @@ int vtkmCleanGrid::RequestData(vtkInformation* vtkNotUsed(request), return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmCleanGrid.h b/Accelerators/Vtkm/Filters/vtkmCleanGrid.h index fbe9e60c1d..250ba1c184 100644 --- a/Accelerators/Vtkm/Filters/vtkmCleanGrid.h +++ b/Accelerators/Vtkm/Filters/vtkmCleanGrid.h @@ -30,6 +30,7 @@ #include "vtkUnstructuredGridAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class vtkUnstructuredGrid; @@ -67,4 +68,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmCleanGrid_h diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx index 45a886291e..0157deaf9e 100644 --- a/Accelerators/Vtkm/Filters/vtkmClip.cxx +++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx @@ -41,6 +41,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmClip); //------------------------------------------------------------------------------ @@ -214,3 +215,4 @@ int vtkmClip::FillInputPortInformation(int, vtkInformation* info) info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkImageData"); return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmClip.h b/Accelerators/Vtkm/Filters/vtkmClip.h index 82ffaf43e2..fb776288ba 100644 --- a/Accelerators/Vtkm/Filters/vtkmClip.h +++ b/Accelerators/Vtkm/Filters/vtkmClip.h @@ -31,6 +31,7 @@ #include // For std::unique_ptr +VTK_ABI_NAMESPACE_BEGIN class vtkImplicitFunction; class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm @@ -93,4 +94,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmClip_h diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx index a2d0ecb5be..f1b52834d4 100644 --- a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx +++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx @@ -19,6 +19,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField( vtkm::cont::DataSet& in, vtkDataArray* scalars, int assoc) { @@ -37,3 +38,4 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField( fieldFilter.SetClipValue(this->ClipValue); return fieldFilter.Execute(in); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx index bf1762090c..b6092c9061 100644 --- a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx @@ -19,6 +19,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::cont::DataSet& in) { auto function = this->ClipFunctionConverter->Get(); @@ -30,3 +31,4 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::c return result; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmClipInternals.h b/Accelerators/Vtkm/Filters/vtkmClipInternals.h index 7b4b1a1a4f..602e8cde11 100644 --- a/Accelerators/Vtkm/Filters/vtkmClipInternals.h +++ b/Accelerators/Vtkm/Filters/vtkmClipInternals.h @@ -22,6 +22,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN struct vtkmClip::internals { double ClipValue = .0; @@ -34,5 +35,6 @@ struct vtkmClip::internals vtkm::cont::DataSet ExecuteClipWithField(vtkm::cont::DataSet&, vtkDataArray*, int); }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkmClipInternals.h diff --git a/Accelerators/Vtkm/Filters/vtkmConfigFilters.h.in b/Accelerators/Vtkm/Filters/vtkmConfigFilters.h.in index f99c237ffe..2012a5d7df 100644 --- a/Accelerators/Vtkm/Filters/vtkmConfigFilters.h.in +++ b/Accelerators/Vtkm/Filters/vtkmConfigFilters.h.in @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef vtkConfigFilters_h -#define vtkConfigFilters_h +#ifndef vtkmConfigFilters_h +#define vtkmConfigFilters_h /*--------------------------------------------------------------------------*/ /* Other Configuration Options */ @@ -52,4 +52,4 @@ #endif -#endif // vtkConfigFilters_h +#endif // vtkmConfigFilters_h diff --git a/Accelerators/Vtkm/Filters/vtkmContour.cxx b/Accelerators/Vtkm/Filters/vtkmContour.cxx index 3d4d45abed..17a64c7681 100644 --- a/Accelerators/Vtkm/Filters/vtkmContour.cxx +++ b/Accelerators/Vtkm/Filters/vtkmContour.cxx @@ -38,6 +38,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmContour); //------------------------------------------------------------------------------ @@ -257,3 +258,4 @@ int vtkmContour::RequestData( // we got this far, everything is good return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmContour.h b/Accelerators/Vtkm/Filters/vtkmContour.h index 62fe3a1619..b8ec766456 100644 --- a/Accelerators/Vtkm/Filters/vtkmContour.h +++ b/Accelerators/Vtkm/Filters/vtkmContour.h @@ -37,6 +37,7 @@ #include "vtkContourFilter.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmContour : public vtkContourFilter { public: @@ -63,4 +64,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmContour_h diff --git a/Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.cxx b/Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.cxx index 750e414de9..0a0806566e 100644 --- a/Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.cxx +++ b/Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.cxx @@ -36,6 +36,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmCoordinateSystemTransform); //------------------------------------------------------------------------------ @@ -204,3 +205,4 @@ void vtkmCoordinateSystemTransform::PrintSelf(std::ostream& os, vtkIndent indent { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.h b/Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.h index 3fc155d74d..3aa080712c 100644 --- a/Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.h +++ b/Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.h @@ -29,6 +29,7 @@ #include "vtkPointSetAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmCoordinateSystemTransform : public vtkPointSetAlgorithm { enum struct TransformTypes @@ -70,4 +71,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmCoordinateSystemTransform_h diff --git a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx index d17f985db7..e036460eb2 100644 --- a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx +++ b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx @@ -34,6 +34,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmExternalFaces); //------------------------------------------------------------------------------ @@ -132,3 +133,4 @@ int vtkmExternalFaces::RequestData(vtkInformation* vtkNotUsed(request), return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmExternalFaces.h b/Accelerators/Vtkm/Filters/vtkmExternalFaces.h index a242981d46..454c743bad 100644 --- a/Accelerators/Vtkm/Filters/vtkmExternalFaces.h +++ b/Accelerators/Vtkm/Filters/vtkmExternalFaces.h @@ -32,6 +32,7 @@ #include "vtkAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class vtkUnstructuredGrid; class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmExternalFaces : public vtkAlgorithm @@ -81,4 +82,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmExternalFaces_h diff --git a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx index c3608c5291..ee53015a86 100644 --- a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx +++ b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx @@ -28,6 +28,7 @@ #include "vtkm/filter/entity_extraction/ExtractStructured.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmExtractVOI); //------------------------------------------------------------------------------ @@ -96,3 +97,4 @@ int vtkmExtractVOI::RequestData( return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmExtractVOI.h b/Accelerators/Vtkm/Filters/vtkmExtractVOI.h index be63cb292e..eeaf23ae61 100644 --- a/Accelerators/Vtkm/Filters/vtkmExtractVOI.h +++ b/Accelerators/Vtkm/Filters/vtkmExtractVOI.h @@ -39,6 +39,7 @@ #include "vtkExtractVOI.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmExtractVOI : public vtkExtractVOI { public: @@ -72,4 +73,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmExtractVOI_h diff --git a/Accelerators/Vtkm/Filters/vtkmFilterOverrides.cxx.in b/Accelerators/Vtkm/Filters/vtkmFilterOverrides.cxx.in index 1575b6d269..81ef5f76b8 100644 --- a/Accelerators/Vtkm/Filters/vtkmFilterOverrides.cxx.in +++ b/Accelerators/Vtkm/Filters/vtkmFilterOverrides.cxx.in @@ -19,6 +19,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -59,3 +60,4 @@ bool vtkmFilterOverrides::GetEnabled() { return vtkmFilterOverridesEnabled; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmFilterOverrides.h b/Accelerators/Vtkm/Filters/vtkmFilterOverrides.h index 489f8d4bb6..510666aea8 100644 --- a/Accelerators/Vtkm/Filters/vtkmFilterOverrides.h +++ b/Accelerators/Vtkm/Filters/vtkmFilterOverrides.h @@ -19,6 +19,7 @@ /// A class with static methods to turn vtkm filter overrides on/off at runtime /// +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmFilterOverrides { public: @@ -36,5 +37,6 @@ public: ///@} }; +VTK_ABI_NAMESPACE_END #endif // vtkmFilterOverrides_h // VTK-HeaderTest-Exclude: vtkmFilterOverrides.h diff --git a/Accelerators/Vtkm/Filters/vtkmGradient.cxx b/Accelerators/Vtkm/Filters/vtkmGradient.cxx index 775bed68da..6de8456beb 100644 --- a/Accelerators/Vtkm/Filters/vtkmGradient.cxx +++ b/Accelerators/Vtkm/Filters/vtkmGradient.cxx @@ -35,6 +35,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmGradient); namespace @@ -363,3 +364,4 @@ int vtkmGradient::RequestData( return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmGradient.h b/Accelerators/Vtkm/Filters/vtkmGradient.h index 5936248d31..0556edb13a 100644 --- a/Accelerators/Vtkm/Filters/vtkmGradient.h +++ b/Accelerators/Vtkm/Filters/vtkmGradient.h @@ -37,6 +37,7 @@ #include "vtkGradientFilter.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmGradient : public vtkGradientFilter { public: @@ -77,4 +78,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmGradient_h diff --git a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx index 56943122b1..9290b5efc3 100644 --- a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx +++ b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx @@ -33,6 +33,7 @@ #include "vtkmFilterPolicy.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmHistogram); //------------------------------------------------------------------------------ @@ -163,3 +164,4 @@ void vtkmHistogram::FillBinExtents(vtkDoubleArray* binExtents) (this->CenterBinsAroundMinAndMax ? 0.0 : halfBinDelta)); } } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmHistogram.h b/Accelerators/Vtkm/Filters/vtkmHistogram.h index 875a14c917..18a75eac17 100644 --- a/Accelerators/Vtkm/Filters/vtkmHistogram.h +++ b/Accelerators/Vtkm/Filters/vtkmHistogram.h @@ -30,6 +30,7 @@ #include "vtkTableAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmHistogram : public vtkTableAlgorithm @@ -113,4 +114,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmHistogram_h diff --git a/Accelerators/Vtkm/Filters/vtkmImageConnectivity.cxx b/Accelerators/Vtkm/Filters/vtkmImageConnectivity.cxx index 0125bb96ef..5ea45e85dd 100644 --- a/Accelerators/Vtkm/Filters/vtkmImageConnectivity.cxx +++ b/Accelerators/Vtkm/Filters/vtkmImageConnectivity.cxx @@ -29,6 +29,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmImageConnectivity); //------------------------------------------------------------------------------ @@ -99,3 +100,4 @@ int vtkmImageConnectivity::RequestData( } return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmImageConnectivity.h b/Accelerators/Vtkm/Filters/vtkmImageConnectivity.h index 35c406c678..538355eaa1 100644 --- a/Accelerators/Vtkm/Filters/vtkmImageConnectivity.h +++ b/Accelerators/Vtkm/Filters/vtkmImageConnectivity.h @@ -41,6 +41,7 @@ #include "vtkImageAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmImageConnectivity : public vtkImageAlgorithm { public: @@ -60,4 +61,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmImageConnectivity_h diff --git a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx index 210f7b8169..3159750dab 100644 --- a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx +++ b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx @@ -34,6 +34,7 @@ // To handle computing custom coordinate sets bounds we need to include // the following +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmLevelOfDetail); //------------------------------------------------------------------------------ @@ -165,3 +166,4 @@ void vtkmLevelOfDetail::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Number of Y Divisions: " << this->NumberOfDivisions[1] << "\n"; os << indent << "Number of Z Divisions: " << this->NumberOfDivisions[2] << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.h b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.h index 38021c1e73..e862ab1008 100644 --- a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.h +++ b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.h @@ -51,6 +51,7 @@ #include "vtkPolyDataAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmLevelOfDetail : public vtkPolyDataAlgorithm { public: @@ -94,4 +95,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmLevelOfDetail_h diff --git a/Accelerators/Vtkm/Filters/vtkmNDHistogram.cxx b/Accelerators/Vtkm/Filters/vtkmNDHistogram.cxx index 2a6f6ac4fc..fd5f8c5a1a 100644 --- a/Accelerators/Vtkm/Filters/vtkmNDHistogram.cxx +++ b/Accelerators/Vtkm/Filters/vtkmNDHistogram.cxx @@ -32,6 +32,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmNDHistogram); //------------------------------------------------------------------------------ @@ -199,3 +200,4 @@ int vtkmNDHistogram::RequestData(vtkInformation* vtkNotUsed(request), } return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmNDHistogram.h b/Accelerators/Vtkm/Filters/vtkmNDHistogram.h index 9442251a22..33ba265f94 100644 --- a/Accelerators/Vtkm/Filters/vtkmNDHistogram.h +++ b/Accelerators/Vtkm/Filters/vtkmNDHistogram.h @@ -42,6 +42,7 @@ #include "vtkArrayDataAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmNDHistogram : public vtkArrayDataAlgorithm { public: @@ -80,4 +81,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmNDHistogram_h diff --git a/Accelerators/Vtkm/Filters/vtkmPointElevation.cxx b/Accelerators/Vtkm/Filters/vtkmPointElevation.cxx index 9def68b26c..0585f2c360 100644 --- a/Accelerators/Vtkm/Filters/vtkmPointElevation.cxx +++ b/Accelerators/Vtkm/Filters/vtkmPointElevation.cxx @@ -30,6 +30,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmPointElevation); //------------------------------------------------------------------------------ @@ -105,3 +106,4 @@ void vtkmPointElevation::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmPointElevation.h b/Accelerators/Vtkm/Filters/vtkmPointElevation.h index 0d4a84ca9e..2e1e4b733c 100644 --- a/Accelerators/Vtkm/Filters/vtkmPointElevation.h +++ b/Accelerators/Vtkm/Filters/vtkmPointElevation.h @@ -32,6 +32,7 @@ #include "vtkElevationFilter.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmPointElevation : public vtkElevationFilter { public: @@ -66,4 +67,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmPointElevation_h diff --git a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx index 909fecdb8e..a026ee77c3 100644 --- a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx +++ b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx @@ -36,6 +36,7 @@ #include "vtkmFilterPolicy.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmPointTransform); vtkCxxSetObjectMacro(vtkmPointTransform, Transform, vtkHomogeneousTransform); @@ -168,3 +169,4 @@ void vtkmPointTransform::PrintSelf(std::ostream& os, vtkIndent indent) this->Superclass::PrintSelf(os, indent); os << indent << "Transform: " << this->Transform << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmPointTransform.h b/Accelerators/Vtkm/Filters/vtkmPointTransform.h index 7e8d8c7053..2fe48b0e8c 100644 --- a/Accelerators/Vtkm/Filters/vtkmPointTransform.h +++ b/Accelerators/Vtkm/Filters/vtkmPointTransform.h @@ -28,6 +28,7 @@ #include "vtkPointSetAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class vtkHomogeneousTransform; class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmPointTransform : public vtkPointSetAlgorithm @@ -62,4 +63,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Accelerators/Vtkm/Filters/vtkmPolyDataNormals.cxx b/Accelerators/Vtkm/Filters/vtkmPolyDataNormals.cxx index 56dd389059..45aaf752e3 100644 --- a/Accelerators/Vtkm/Filters/vtkmPolyDataNormals.cxx +++ b/Accelerators/Vtkm/Filters/vtkmPolyDataNormals.cxx @@ -28,6 +28,7 @@ #include "vtkm/filter/vector_analysis/SurfaceNormals.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmPolyDataNormals); //------------------------------------------------------------------------------ @@ -130,3 +131,4 @@ int vtkmPolyDataNormals::RequestData( return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmPolyDataNormals.h b/Accelerators/Vtkm/Filters/vtkmPolyDataNormals.h index 5e071fbdc2..aeffe8a012 100644 --- a/Accelerators/Vtkm/Filters/vtkmPolyDataNormals.h +++ b/Accelerators/Vtkm/Filters/vtkmPolyDataNormals.h @@ -46,6 +46,7 @@ #include "vtkPolyDataNormals.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmPolyDataNormals : public vtkPolyDataNormals { public: @@ -79,4 +80,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmPolyDataNormals_h diff --git a/Accelerators/Vtkm/Filters/vtkmProbe.cxx b/Accelerators/Vtkm/Filters/vtkmProbe.cxx index 029217ff66..3e6c5e71dd 100644 --- a/Accelerators/Vtkm/Filters/vtkmProbe.cxx +++ b/Accelerators/Vtkm/Filters/vtkmProbe.cxx @@ -32,6 +32,7 @@ #include "vtkm/filter/Probe.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmProbe); //------------------------------------------------------------------------------ @@ -263,3 +264,4 @@ void vtkmProbe::PrintSelf(ostream& os, vtkIndent indent) os << indent << "PassCellArrays: " << this->PassCellArrays << "\n"; os << indent << "PassFieldArray: " << this->PassFieldArrays << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmProbe.h b/Accelerators/Vtkm/Filters/vtkmProbe.h index 5bf9014df5..9343ee1d01 100644 --- a/Accelerators/Vtkm/Filters/vtkmProbe.h +++ b/Accelerators/Vtkm/Filters/vtkmProbe.h @@ -50,6 +50,7 @@ #include "vtkDataSetAlgorithm.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmProbe : public vtkDataSetAlgorithm { public: @@ -155,4 +156,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmProbe_h diff --git a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx index 05f8119ed3..827110766e 100644 --- a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx +++ b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx @@ -32,6 +32,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmThreshold); //------------------------------------------------------------------------------ @@ -100,3 +101,4 @@ void vtkmThreshold::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmThreshold.h b/Accelerators/Vtkm/Filters/vtkmThreshold.h index 1a82de7cc8..e5c76f8637 100644 --- a/Accelerators/Vtkm/Filters/vtkmThreshold.h +++ b/Accelerators/Vtkm/Filters/vtkmThreshold.h @@ -35,6 +35,7 @@ #include "vtkThreshold.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmThreshold : public vtkThreshold { public: @@ -69,4 +70,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmThreshold_h diff --git a/Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.cxx b/Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.cxx index 260464f054..47de3c2d68 100644 --- a/Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.cxx +++ b/Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.cxx @@ -29,6 +29,7 @@ #include "vtkm/filter/vector_analysis/SurfaceNormals.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmTriangleMeshPointNormals); //------------------------------------------------------------------------------ @@ -109,3 +110,4 @@ int vtkmTriangleMeshPointNormals::RequestData( return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.h b/Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.h index 47a16b6035..33228888df 100644 --- a/Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.h +++ b/Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.h @@ -51,6 +51,7 @@ #include "vtkTriangleMeshPointNormals.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmTriangleMeshPointNormals : public vtkTriangleMeshPointNormals { @@ -85,4 +86,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmTriangleMeshPointNormals_h diff --git a/Accelerators/Vtkm/Filters/vtkmWarpScalar.cxx b/Accelerators/Vtkm/Filters/vtkmWarpScalar.cxx index 4d13c6549f..eee7a629ce 100644 --- a/Accelerators/Vtkm/Filters/vtkmWarpScalar.cxx +++ b/Accelerators/Vtkm/Filters/vtkmWarpScalar.cxx @@ -35,6 +35,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmWarpScalar); //------------------------------------------------------------------------------ @@ -185,3 +186,4 @@ void vtkmWarpScalar::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmWarpScalar.h b/Accelerators/Vtkm/Filters/vtkmWarpScalar.h index 95fbbd61c1..a0885f2fb7 100644 --- a/Accelerators/Vtkm/Filters/vtkmWarpScalar.h +++ b/Accelerators/Vtkm/Filters/vtkmWarpScalar.h @@ -44,6 +44,7 @@ #include "vtkWarpScalar.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmWarpScalar : public vtkWarpScalar { public: @@ -64,4 +65,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmWarpScalar_h diff --git a/Accelerators/Vtkm/Filters/vtkmWarpVector.cxx b/Accelerators/Vtkm/Filters/vtkmWarpVector.cxx index 853e1d2435..a0c2ce1232 100644 --- a/Accelerators/Vtkm/Filters/vtkmWarpVector.cxx +++ b/Accelerators/Vtkm/Filters/vtkmWarpVector.cxx @@ -35,6 +35,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkmWarpVector); //------------------------------------------------------------------------------ @@ -132,3 +133,4 @@ void vtkmWarpVector::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Accelerators/Vtkm/Filters/vtkmWarpVector.h b/Accelerators/Vtkm/Filters/vtkmWarpVector.h index d077a462f5..f79f4f75e5 100644 --- a/Accelerators/Vtkm/Filters/vtkmWarpVector.h +++ b/Accelerators/Vtkm/Filters/vtkmWarpVector.h @@ -31,6 +31,7 @@ #include "vtkWarpVector.h" #include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m +VTK_ABI_NAMESPACE_BEGIN class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmWarpVector : public vtkWarpVector { public: @@ -51,4 +52,5 @@ private: vtkmInitializer Initializer; }; +VTK_ABI_NAMESPACE_END #endif // vtkmWarpVector_h diff --git a/CMake/vtkEncodeString.cmake b/CMake/vtkEncodeString.cmake index 562a98c371..5196ec3999 100644 --- a/CMake/vtkEncodeString.cmake +++ b/CMake/vtkEncodeString.cmake @@ -143,7 +143,10 @@ if (_vtk_encode_string_run AND CMAKE_SCRIPT_MODE_FILE) "#ifndef ${output_name}_h\n#define ${output_name}_h\n\n") if (export_symbol) file(APPEND "${output_header}" - "#include \"${export_header}\"\n\n${export_symbol} ") + "#include \"${export_header}\"\n\nVTK_ABI_NAMESPACE_BEGIN\n${export_symbol} ") + else () + file(APPEND "${output_header}" + "#include \"vtkABINamespace.h\"\n\nVTK_ABI_NAMESPACE_BEGIN\n") endif () if (IS_ABSOLUTE "${source_file}") @@ -164,10 +167,10 @@ if (_vtk_encode_string_run AND CMAKE_SCRIPT_MODE_FILE) string(LENGTH "${original_content}" output_size) math(EXPR output_size "${output_size} / 2") file(APPEND "${output_header}" - "extern const unsigned char ${output_name}[${output_size}];\n\n#endif\n") + "extern const unsigned char ${output_name}[${output_size}];\n\nVTK_ABI_NAMESPACE_END\n#endif\n") file(APPEND "${output_source}" - "#include \"${output_name}.h\"\n\nconst unsigned char ${output_name}[${output_size}] = {\n") + "#include \"${output_name}.h\"\n\nVTK_ABI_NAMESPACE_BEGIN\n\nconst unsigned char ${output_name}[${output_size}] = {\n") string(REGEX REPLACE "\([0-9a-f][0-9a-f]\)" ",0x\\1" escaped_content "${original_content}") # Hard line wrap the file. string(REGEX REPLACE "\(..........................................................................,\)" "\\1\n" escaped_content "${escaped_content}") @@ -176,10 +179,10 @@ if (_vtk_encode_string_run AND CMAKE_SCRIPT_MODE_FILE) file(APPEND "${output_source}" "${escaped_content}\n") file(APPEND "${output_source}" - "};\n") + "};\nVTK_ABI_NAMESPACE_END\n") else () file(APPEND "${output_header}" - "extern const char *${output_name};\n\n#endif\n") + "extern const char *${output_name};\n\nVTK_ABI_NAMESPACE_END\n#endif\n") # Escape literal backslashes. string(REPLACE "\\" "\\\\" escaped_content "${original_content}") @@ -189,8 +192,8 @@ if (_vtk_encode_string_run AND CMAKE_SCRIPT_MODE_FILE) string(REPLACE "\n" "\\n\"\n\"" escaped_content "${escaped_content}") file(APPEND "${output_source}" - "#include \"${output_name}.h\"\n\nconst char *${output_name} =\n") + "#include \"${output_name}.h\"\n\nVTK_ABI_NAMESPACE_BEGIN\n\nconst char *${output_name} =\n") file(APPEND "${output_source}" - "\"${escaped_content}\";\n") + "\"${escaped_content}\";\nVTK_ABI_NAMESPACE_END\n") endif () endif () diff --git a/CMake/vtkObjectFactory.cxx.in b/CMake/vtkObjectFactory.cxx.in index cd040941d9..5c65a5ddae 100644 --- a/CMake/vtkObjectFactory.cxx.in +++ b/CMake/vtkObjectFactory.cxx.in @@ -22,6 +22,8 @@ // Include all of the classes we want to create overrides for. @_vtk_object_factory_includes@ +VTK_ABI_NAMESPACE_BEGIN + vtkStandardNewMacro(@_vtk_object_factory_library_name@ObjectFactory); // Now create the functions to create overrides with. @@ -60,3 +62,4 @@ static unsigned int @_vtk_object_factory_library_name@Count = 0; } } } +VTK_ABI_NAMESPACE_END diff --git a/CMake/vtkObjectFactory.h.in b/CMake/vtkObjectFactory.h.in index b51bd66dae..f294fb6fc0 100644 --- a/CMake/vtkObjectFactory.h.in +++ b/CMake/vtkObjectFactory.h.in @@ -19,6 +19,8 @@ #include "@_vtk_object_factory_library_name@Module.h" // For export macro #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN + class @_vtk_object_factory_configure_EXPORT_MACRO@ @_vtk_object_factory_library_name@ObjectFactory : public vtkObjectFactory { public: @@ -39,4 +41,6 @@ private: void operator=(const @_vtk_object_factory_library_name@ObjectFactory&) = delete; }; +VTK_ABI_NAMESPACE_END + #endif // @_vtk_object_factory_library_name@ObjectFactory_h diff --git a/Charts/Core/vtkAxis.cxx b/Charts/Core/vtkAxis.cxx index a523340884..61c3654b62 100644 --- a/Charts/Core/vtkAxis.cxx +++ b/Charts/Core/vtkAxis.cxx @@ -41,6 +41,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAxis); //------------------------------------------------------------------------------ @@ -1952,3 +1953,4 @@ void vtkAxis::PrintSelf(ostream& os, vtkIndent indent) os << indent << "ScalingFactor: " << this->ScalingFactor << "\n"; os << indent << "Shift: " << this->Shift << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkAxis.h b/Charts/Core/vtkAxis.h index a1418a8f66..2f8f4c9c45 100644 --- a/Charts/Core/vtkAxis.h +++ b/Charts/Core/vtkAxis.h @@ -59,6 +59,7 @@ #include "vtkStdString.h" // For vtkStdString ivars #include "vtkVector.h" // For position variables +VTK_ABI_NAMESPACE_BEGIN class vtkContext2D; class vtkFloatArray; class vtkDoubleArray; @@ -794,4 +795,5 @@ private: bool InRange(double value); }; +VTK_ABI_NAMESPACE_END #endif // vtkAxis_h diff --git a/Charts/Core/vtkAxisExtended.cxx b/Charts/Core/vtkAxisExtended.cxx index cc51be5da1..6f51d21045 100644 --- a/Charts/Core/vtkAxisExtended.cxx +++ b/Charts/Core/vtkAxisExtended.cxx @@ -23,6 +23,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAxisExtended); vtkAxisExtended::vtkAxisExtended() @@ -526,3 +527,4 @@ void vtkAxisExtended::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Precision: " << this->Precision << endl; os << indent << "LabelFormat: " << this->LabelFormat << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkAxisExtended.h b/Charts/Core/vtkAxisExtended.h index 067f2e26ca..6b7533093a 100644 --- a/Charts/Core/vtkAxisExtended.h +++ b/Charts/Core/vtkAxisExtended.h @@ -33,6 +33,7 @@ #include "vtkObject.h" #include "vtkVector.h" // Needed for vtkVector +VTK_ABI_NAMESPACE_BEGIN class VTKCHARTSCORE_EXPORT vtkAxisExtended : public vtkObject { public: @@ -136,3 +137,4 @@ private: vtkAxisExtended(const vtkAxisExtended&) = delete; void operator=(const vtkAxisExtended&) = delete; }; +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkCategoryLegend.cxx b/Charts/Core/vtkCategoryLegend.cxx index bb54c07a24..73d24aebff 100644 --- a/Charts/Core/vtkCategoryLegend.cxx +++ b/Charts/Core/vtkCategoryLegend.cxx @@ -22,6 +22,7 @@ #include "vtkVariantArray.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCategoryLegend); vtkCxxSetObjectMacro(vtkCategoryLegend, Values, vtkVariantArray); @@ -301,3 +302,4 @@ void vtkCategoryLegend::PrintSelf(ostream& os, vtkIndent indent) os << indent << "TitleProperties: \n"; this->TitleProperties->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkCategoryLegend.h b/Charts/Core/vtkCategoryLegend.h index a7f7574419..a44e75346a 100644 --- a/Charts/Core/vtkCategoryLegend.h +++ b/Charts/Core/vtkCategoryLegend.h @@ -34,6 +34,7 @@ #include "vtkStdString.h" // For vtkStdString ivars #include "vtkVector.h" // For vtkRectf +VTK_ABI_NAMESPACE_BEGIN class vtkScalarsToColors; class vtkTextProperty; class vtkVariantArray; @@ -120,4 +121,5 @@ private: void operator=(const vtkCategoryLegend&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkChart.cxx b/Charts/Core/vtkChart.cxx index f4b6b70944..6f00cc7566 100644 --- a/Charts/Core/vtkChart.cxx +++ b/Charts/Core/vtkChart.cxx @@ -24,6 +24,7 @@ #include "vtkTextProperty.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkChart::MouseActions::MouseActions() { this->Pan() = vtkContextMouseEvent::LEFT_BUTTON; @@ -484,3 +485,4 @@ void vtkChart::AxisRangeForwarderCallback(vtkObject*, unsigned long, void*) } this->InvokeEvent(vtkChart::UpdateRange, fullAxisRange); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChart.h b/Charts/Core/vtkChart.h index f3bd880dea..0eeac7524c 100644 --- a/Charts/Core/vtkChart.h +++ b/Charts/Core/vtkChart.h @@ -31,6 +31,7 @@ #include "vtkSmartPointer.h" // For SP ivars #include "vtkStdString.h" // For vtkStdString ivars +VTK_ABI_NAMESPACE_BEGIN class vtkTransform2D; class vtkContextScene; class vtkPlot; @@ -495,4 +496,5 @@ private: void operator=(const vtkChart&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkChart_h diff --git a/Charts/Core/vtkChartBox.cxx b/Charts/Core/vtkChartBox.cxx index 64f3c06bc7..b943c1ece5 100644 --- a/Charts/Core/vtkChartBox.cxx +++ b/Charts/Core/vtkChartBox.cxx @@ -45,6 +45,7 @@ #include // Minimal storage class for STL containers etc. +VTK_ABI_NAMESPACE_BEGIN class vtkChartBox::Private { public: @@ -733,3 +734,4 @@ void vtkChartBox::SwapAxes(int a1, int a2) this->Storage->Plot->Update(); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChartBox.h b/Charts/Core/vtkChartBox.h index a15ccb0657..ebeb060a21 100644 --- a/Charts/Core/vtkChartBox.h +++ b/Charts/Core/vtkChartBox.h @@ -27,6 +27,7 @@ #include "vtkChart.h" #include "vtkChartsCoreModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkIdTypeArray; class vtkPlotBox; class vtkStdString; @@ -256,4 +257,5 @@ struct vtkChartBoxData }; ///@} +VTK_ABI_NAMESPACE_END #endif // vtkChartBox_h diff --git a/Charts/Core/vtkChartHistogram2D.cxx b/Charts/Core/vtkChartHistogram2D.cxx index 053ac9e46f..c7add8e888 100644 --- a/Charts/Core/vtkChartHistogram2D.cxx +++ b/Charts/Core/vtkChartHistogram2D.cxx @@ -29,6 +29,7 @@ #include "vtkTooltipItem.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkChartHistogram2D); //------------------------------------------------------------------------------ @@ -113,3 +114,4 @@ void vtkChartHistogram2D::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChartHistogram2D.h b/Charts/Core/vtkChartHistogram2D.h index f6a31189b2..be3355fcb7 100644 --- a/Charts/Core/vtkChartHistogram2D.h +++ b/Charts/Core/vtkChartHistogram2D.h @@ -28,6 +28,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkSmartPointer.h" // For SP ivars +VTK_ABI_NAMESPACE_BEGIN class vtkColorLegend; class vtkPlotHistogram2D; class vtkImageData; @@ -85,4 +86,5 @@ private: void operator=(const vtkChartHistogram2D&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkChartHistogram2D_h diff --git a/Charts/Core/vtkChartLegend.cxx b/Charts/Core/vtkChartLegend.cxx index 5f0bbfac17..4761fe6d5e 100644 --- a/Charts/Core/vtkChartLegend.cxx +++ b/Charts/Core/vtkChartLegend.cxx @@ -34,6 +34,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN class vtkChartLegend::Private { public: @@ -346,3 +347,4 @@ void vtkChartLegend::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChartLegend.h b/Charts/Core/vtkChartLegend.h index 8acba6c0a9..065822310b 100644 --- a/Charts/Core/vtkChartLegend.h +++ b/Charts/Core/vtkChartLegend.h @@ -31,6 +31,7 @@ #include "vtkNew.h" // For vtkNew #include "vtkRect.h" // For vtkRectf return value +VTK_ABI_NAMESPACE_BEGIN class vtkChart; class vtkPen; class vtkBrush; @@ -316,4 +317,5 @@ private: void operator=(const vtkChartLegend&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkChartLegend_h diff --git a/Charts/Core/vtkChartMatrix.cxx b/Charts/Core/vtkChartMatrix.cxx index 71a096dcb8..24c8bb8b10 100644 --- a/Charts/Core/vtkChartMatrix.cxx +++ b/Charts/Core/vtkChartMatrix.cxx @@ -29,6 +29,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN class vtkChartMatrix::PIMPL { public: @@ -852,3 +853,4 @@ void vtkChartMatrix::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChartMatrix.h b/Charts/Core/vtkChartMatrix.h index c16069a9f4..6c75ec7e19 100644 --- a/Charts/Core/vtkChartMatrix.h +++ b/Charts/Core/vtkChartMatrix.h @@ -34,6 +34,7 @@ #include // For specific gutter #include // For specific gutter +VTK_ABI_NAMESPACE_BEGIN class vtkChart; class VTKCHARTSCORE_EXPORT vtkChartMatrix : public vtkAbstractContextItem @@ -307,4 +308,5 @@ private: PIMPL* Private; }; +VTK_ABI_NAMESPACE_END #endif // vtkChartMatrix_h diff --git a/Charts/Core/vtkChartParallelCoordinates.cxx b/Charts/Core/vtkChartParallelCoordinates.cxx index 71c1fe4c29..3dc111db29 100644 --- a/Charts/Core/vtkChartParallelCoordinates.cxx +++ b/Charts/Core/vtkChartParallelCoordinates.cxx @@ -42,6 +42,7 @@ #include // Minimal storage class for STL containers etc. +VTK_ABI_NAMESPACE_BEGIN struct vtkChartParallelCoordinates::Private final { Private() { this->Plot = vtkSmartPointer::New(); } @@ -916,3 +917,4 @@ void vtkChartParallelCoordinates::UpdateCurrentAxisSelection(int axisId) // To support multiple selection, we need to recalculate all the selection this->ResetSelection(); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChartParallelCoordinates.h b/Charts/Core/vtkChartParallelCoordinates.h index 6f90f73dbb..d4bc8396b8 100644 --- a/Charts/Core/vtkChartParallelCoordinates.h +++ b/Charts/Core/vtkChartParallelCoordinates.h @@ -28,6 +28,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkNew.h" // For vtkNew +VTK_ABI_NAMESPACE_BEGIN class vtkIdTypeArray; class vtkStdString; class vtkStringArray; @@ -201,4 +202,5 @@ private: void operator=(const vtkChartParallelCoordinates&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkChartParallelCoordinates_h diff --git a/Charts/Core/vtkChartPie.cxx b/Charts/Core/vtkChartPie.cxx index 9ade92eaba..90c5f8f408 100644 --- a/Charts/Core/vtkChartPie.cxx +++ b/Charts/Core/vtkChartPie.cxx @@ -30,6 +30,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN class vtkChartPiePrivate { public: @@ -292,3 +293,4 @@ void vtkChartPie::PrintSelf(ostream& os, vtkIndent indent) this->Private->Plot->PrintSelf(os, indent.GetNextIndent()); } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChartPie.h b/Charts/Core/vtkChartPie.h index 20becd70b2..6ed0abfecf 100644 --- a/Charts/Core/vtkChartPie.h +++ b/Charts/Core/vtkChartPie.h @@ -27,6 +27,7 @@ #include "vtkChart.h" #include "vtkChartsCoreModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkChartLegend; class vtkTooltipItem; class vtkChartPiePrivate; @@ -166,4 +167,5 @@ private: vtkChartPiePrivate* Private; }; +VTK_ABI_NAMESPACE_END #endif // vtkChartPie_h diff --git a/Charts/Core/vtkChartXY.cxx b/Charts/Core/vtkChartXY.cxx index 2804b23c38..2044011847 100644 --- a/Charts/Core/vtkChartXY.cxx +++ b/Charts/Core/vtkChartXY.cxx @@ -65,6 +65,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN class vtkChartXYPrivate { public: @@ -2911,3 +2912,4 @@ int vtkChartXY::GetMouseSelectionMode(const vtkContextMouseEvent& mouse, int sel } return selectionMode; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChartXY.h b/Charts/Core/vtkChartXY.h index 342ab20ac6..fc511d3967 100644 --- a/Charts/Core/vtkChartXY.h +++ b/Charts/Core/vtkChartXY.h @@ -35,6 +35,7 @@ #include // for std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkAxis; class vtkChartLegend; class vtkIdTypeArray; @@ -45,8 +46,10 @@ class vtkTooltipItem; class vtkChartXYPrivate; // Private class to keep my STL vector in... +VTK_ABI_NAMESPACE_END #include // for std::map +VTK_ABI_NAMESPACE_BEGIN class VTKCHARTSCORE_EXPORT vtkChartXY : public vtkChart { public: @@ -638,4 +641,5 @@ struct vtkChartPlotData }; ///@} +VTK_ABI_NAMESPACE_END #endif // vtkChartXY_h diff --git a/Charts/Core/vtkChartXYZ.cxx b/Charts/Core/vtkChartXYZ.cxx index 2d63c83f04..27d092934e 100644 --- a/Charts/Core/vtkChartXYZ.cxx +++ b/Charts/Core/vtkChartXYZ.cxx @@ -45,6 +45,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkChartXYZ); //------------------------------------------------------------------------------ @@ -1974,3 +1975,4 @@ void vtkChartXYZ::SetClippingPlanesEnabled(bool v) this->Scene->SetDirty(true); } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkChartXYZ.h b/Charts/Core/vtkChartXYZ.h index df756f2170..278ffee3ce 100644 --- a/Charts/Core/vtkChartXYZ.h +++ b/Charts/Core/vtkChartXYZ.h @@ -33,6 +33,7 @@ #include "vtkTextProperty.h" // For axes text properties #include // For ivars +VTK_ABI_NAMESPACE_BEGIN class vtkAnnotationLink; class vtkAxis; class vtkContext3D; @@ -702,4 +703,5 @@ private: void operator=(const vtkChartXYZ&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkColorLegend.cxx b/Charts/Core/vtkColorLegend.cxx index e37ade3db8..84143bdcde 100644 --- a/Charts/Core/vtkColorLegend.cxx +++ b/Charts/Core/vtkColorLegend.cxx @@ -29,6 +29,7 @@ #include "vtkTransform2D.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkColorLegend); //------------------------------------------------------------------------------ @@ -367,3 +368,4 @@ bool vtkColorLegend::MouseMoveEvent(const vtkContextMouseEvent& mouse) this->UpdateAxisPosition(); return retval; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkColorLegend.h b/Charts/Core/vtkColorLegend.h index f6aa3918f6..fa1a12f616 100644 --- a/Charts/Core/vtkColorLegend.h +++ b/Charts/Core/vtkColorLegend.h @@ -29,6 +29,7 @@ #include "vtkSmartPointer.h" // For SP ivars #include "vtkVector.h" // For vtkRectf +VTK_ABI_NAMESPACE_BEGIN class vtkAxis; class vtkContextMouseEvent; class vtkImageData; @@ -184,4 +185,5 @@ private: void operator=(const vtkColorLegend&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkColorTransferControlPointsItem.cxx b/Charts/Core/vtkColorTransferControlPointsItem.cxx index f8bd73c036..6b8b136fcd 100644 --- a/Charts/Core/vtkColorTransferControlPointsItem.cxx +++ b/Charts/Core/vtkColorTransferControlPointsItem.cxx @@ -32,6 +32,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkColorTransferControlPointsItem); //------------------------------------------------------------------------------ @@ -241,3 +242,4 @@ void vtkColorTransferControlPointsItem::ComputeBounds(double* bounds) this->Superclass::ComputeBounds(bounds); } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkColorTransferControlPointsItem.h b/Charts/Core/vtkColorTransferControlPointsItem.h index fa71c97c62..c5257e8297 100644 --- a/Charts/Core/vtkColorTransferControlPointsItem.h +++ b/Charts/Core/vtkColorTransferControlPointsItem.h @@ -31,6 +31,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkControlPointsItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkColorTransferFunction; class VTKCHARTSCORE_EXPORT vtkColorTransferControlPointsItem : public vtkControlPointsItem @@ -126,4 +127,5 @@ private: void operator=(const vtkColorTransferControlPointsItem&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkColorTransferFunctionItem.cxx b/Charts/Core/vtkColorTransferFunctionItem.cxx index 2f218012fd..67ccedb671 100644 --- a/Charts/Core/vtkColorTransferFunctionItem.cxx +++ b/Charts/Core/vtkColorTransferFunctionItem.cxx @@ -31,6 +31,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkColorTransferFunctionItem); //------------------------------------------------------------------------------ @@ -151,3 +152,4 @@ bool vtkColorTransferFunctionItem::ConfigurePlotBar() } return ret; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkColorTransferFunctionItem.h b/Charts/Core/vtkColorTransferFunctionItem.h index 3b6d3914cc..78342c51fd 100644 --- a/Charts/Core/vtkColorTransferFunctionItem.h +++ b/Charts/Core/vtkColorTransferFunctionItem.h @@ -19,6 +19,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkScalarsToColorsItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkColorTransferFunction; class vtkImageData; @@ -57,4 +58,5 @@ private: void operator=(const vtkColorTransferFunctionItem&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkCompositeControlPointsItem.cxx b/Charts/Core/vtkCompositeControlPointsItem.cxx index f601db85b3..f6e11df83d 100644 --- a/Charts/Core/vtkCompositeControlPointsItem.cxx +++ b/Charts/Core/vtkCompositeControlPointsItem.cxx @@ -34,6 +34,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCompositeControlPointsItem); //------------------------------------------------------------------------------ @@ -420,3 +421,4 @@ void vtkCompositeControlPointsItem::EditPointCurve(vtkIdType index) } } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkCompositeControlPointsItem.h b/Charts/Core/vtkCompositeControlPointsItem.h index 29e1e55a21..14705971a6 100644 --- a/Charts/Core/vtkCompositeControlPointsItem.h +++ b/Charts/Core/vtkCompositeControlPointsItem.h @@ -33,6 +33,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkColorTransferControlPointsItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPiecewiseFunction; class vtkPiecewisePointHandleItem; @@ -168,4 +169,5 @@ private: void operator=(const vtkCompositeControlPointsItem&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkCompositeTransferFunctionItem.cxx b/Charts/Core/vtkCompositeTransferFunctionItem.cxx index f97cd987f9..f5a05cb0a8 100644 --- a/Charts/Core/vtkCompositeTransferFunctionItem.cxx +++ b/Charts/Core/vtkCompositeTransferFunctionItem.cxx @@ -31,6 +31,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCompositeTransferFunctionItem); //------------------------------------------------------------------------------ @@ -163,3 +164,4 @@ void vtkCompositeTransferFunctionItem::ComputeTexture() } } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkCompositeTransferFunctionItem.h b/Charts/Core/vtkCompositeTransferFunctionItem.h index 36b5d17b39..a879cab24f 100644 --- a/Charts/Core/vtkCompositeTransferFunctionItem.h +++ b/Charts/Core/vtkCompositeTransferFunctionItem.h @@ -19,6 +19,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkColorTransferFunctionItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPiecewiseFunction; // Description: @@ -49,4 +50,5 @@ private: void operator=(const vtkCompositeTransferFunctionItem&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkContextArea.cxx b/Charts/Core/vtkContextArea.cxx index 9db48f63c8..9296cbc3ec 100644 --- a/Charts/Core/vtkContextArea.cxx +++ b/Charts/Core/vtkContextArea.cxx @@ -26,6 +26,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkContextArea); //------------------------------------------------------------------------------ @@ -405,3 +406,4 @@ bool vtkContextArea::GetShowGrid() { return this->Grid->GetVisible(); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkContextArea.h b/Charts/Core/vtkContextArea.h index bc8f6170ec..ddfccced4b 100644 --- a/Charts/Core/vtkContextArea.h +++ b/Charts/Core/vtkContextArea.h @@ -47,6 +47,7 @@ #include "vtkNew.h" // For vtkNew #include "vtkRect.h" // For vtkRect/vtkVector/vtkTuple +VTK_ABI_NAMESPACE_BEGIN class vtkContextClip; class vtkContextTransform; class vtkPlotGrid; @@ -299,4 +300,5 @@ private: void operator=(const vtkContextArea&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkContextArea_h diff --git a/Charts/Core/vtkContextPolygon.cxx b/Charts/Core/vtkContextPolygon.cxx index cb96e8e09c..b6ed29a4ba 100644 --- a/Charts/Core/vtkContextPolygon.cxx +++ b/Charts/Core/vtkContextPolygon.cxx @@ -21,6 +21,7 @@ #include "vtkTransform2D.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN class vtkContextPolygonPrivate { public: @@ -130,3 +131,4 @@ vtkContextPolygon& vtkContextPolygon::operator=(const vtkContextPolygon& other) return *this; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkContextPolygon.h b/Charts/Core/vtkContextPolygon.h index 601ec48ead..25419eb190 100644 --- a/Charts/Core/vtkContextPolygon.h +++ b/Charts/Core/vtkContextPolygon.h @@ -20,6 +20,7 @@ #include "vtkType.h" // For vtkIdType #include "vtkVector.h" // For vtkVector2f +VTK_ABI_NAMESPACE_BEGIN class vtkTransform2D; class vtkContextPolygonPrivate; @@ -74,5 +75,6 @@ private: vtkContextPolygonPrivate* const d; }; +VTK_ABI_NAMESPACE_END #endif // vtkContextPolygon_h // VTK-HeaderTest-Exclude: vtkContextPolygon.h diff --git a/Charts/Core/vtkControlPointsItem.cxx b/Charts/Core/vtkControlPointsItem.cxx index b2760b13d1..5bac9b71a5 100644 --- a/Charts/Core/vtkControlPointsItem.cxx +++ b/Charts/Core/vtkControlPointsItem.cxx @@ -41,6 +41,7 @@ // An internal class that is used as an item // to be placed below all other items // in order to hit when trying to add a point +VTK_ABI_NAMESPACE_BEGIN class vtkControlPointsAddPointItem : public vtkPlot { public: @@ -1753,3 +1754,4 @@ vtkVector2f vtkControlPointsItem::GetSelectionCenterOfMass() const { return this->GetCenterOfMass(this->Selection); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkControlPointsItem.h b/Charts/Core/vtkControlPointsItem.h index 8b452498ff..ac0af0726a 100644 --- a/Charts/Core/vtkControlPointsItem.h +++ b/Charts/Core/vtkControlPointsItem.h @@ -36,6 +36,7 @@ #include "vtkVector.h" // For vtkVector2f #include // Used by GetControlPointLabel +VTK_ABI_NAMESPACE_BEGIN class vtkCallbackCommand; class vtkContext2D; class vtkControlPointsAddPointItem; @@ -525,4 +526,5 @@ private: bool UseAddPointItem = false; vtkNew AddPointItem; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkInteractiveArea.cxx b/Charts/Core/vtkInteractiveArea.cxx index bc3727d1e5..04e652aa15 100644 --- a/Charts/Core/vtkInteractiveArea.cxx +++ b/Charts/Core/vtkInteractiveArea.cxx @@ -29,6 +29,7 @@ /** * Hold mouse action key-mappings and other action related resources. */ +VTK_ABI_NAMESPACE_BEGIN class vtkInteractiveArea::MouseActions { public: @@ -266,3 +267,4 @@ void vtkInteractiveArea::ComputeZoom( } } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkInteractiveArea.h b/Charts/Core/vtkInteractiveArea.h index 1979da0fd8..d5f7e417c7 100644 --- a/Charts/Core/vtkInteractiveArea.h +++ b/Charts/Core/vtkInteractiveArea.h @@ -27,6 +27,7 @@ #include "vtkContextArea.h" #include "vtkNew.h" // For vtkNew +VTK_ABI_NAMESPACE_BEGIN class vtkContextTransform; class vtkRectd; @@ -80,4 +81,5 @@ private: void operator=(const vtkInteractiveArea&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkInteractiveArea_h diff --git a/Charts/Core/vtkLookupTableItem.cxx b/Charts/Core/vtkLookupTableItem.cxx index e174a79a15..529086276a 100644 --- a/Charts/Core/vtkLookupTableItem.cxx +++ b/Charts/Core/vtkLookupTableItem.cxx @@ -24,6 +24,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLookupTableItem); //------------------------------------------------------------------------------ @@ -125,3 +126,4 @@ void vtkLookupTableItem::ComputeTexture() } } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkLookupTableItem.h b/Charts/Core/vtkLookupTableItem.h index 7aa116225e..9b3ecc1b1e 100644 --- a/Charts/Core/vtkLookupTableItem.h +++ b/Charts/Core/vtkLookupTableItem.h @@ -19,6 +19,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkScalarsToColorsItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkLookupTable; // Description: @@ -50,4 +51,5 @@ private: void operator=(const vtkLookupTableItem&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkPiecewiseControlPointsItem.cxx b/Charts/Core/vtkPiecewiseControlPointsItem.cxx index 02dc305086..1f1fea0a7d 100644 --- a/Charts/Core/vtkPiecewiseControlPointsItem.cxx +++ b/Charts/Core/vtkPiecewiseControlPointsItem.cxx @@ -32,6 +32,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPiecewiseControlPointsItem); //------------------------------------------------------------------------------ @@ -200,3 +201,4 @@ vtkIdType vtkPiecewiseControlPointsItem::RemovePoint(double* currentPoint) return removedPoint; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPiecewiseControlPointsItem.h b/Charts/Core/vtkPiecewiseControlPointsItem.h index 198d2faa53..a75b38c62e 100644 --- a/Charts/Core/vtkPiecewiseControlPointsItem.h +++ b/Charts/Core/vtkPiecewiseControlPointsItem.h @@ -31,6 +31,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkControlPointsItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPiecewiseFunction; class VTKCHARTSCORE_EXPORT vtkPiecewiseControlPointsItem : public vtkControlPointsItem @@ -89,4 +90,5 @@ private: void operator=(const vtkPiecewiseControlPointsItem&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkPiecewiseFunctionItem.cxx b/Charts/Core/vtkPiecewiseFunctionItem.cxx index 7739e0111b..23564a736e 100644 --- a/Charts/Core/vtkPiecewiseFunctionItem.cxx +++ b/Charts/Core/vtkPiecewiseFunctionItem.cxx @@ -28,6 +28,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPiecewiseFunctionItem); //------------------------------------------------------------------------------ @@ -143,3 +144,4 @@ void vtkPiecewiseFunctionItem::ComputeTexture() } } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPiecewiseFunctionItem.h b/Charts/Core/vtkPiecewiseFunctionItem.h index c0a5a45b3d..7e32a60ab3 100644 --- a/Charts/Core/vtkPiecewiseFunctionItem.h +++ b/Charts/Core/vtkPiecewiseFunctionItem.h @@ -19,6 +19,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkScalarsToColorsItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPiecewiseFunction; class vtkImageData; @@ -52,4 +53,5 @@ private: void operator=(const vtkPiecewiseFunctionItem&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkPiecewisePointHandleItem.cxx b/Charts/Core/vtkPiecewisePointHandleItem.cxx index 07044501fc..5ed6063060 100644 --- a/Charts/Core/vtkPiecewisePointHandleItem.cxx +++ b/Charts/Core/vtkPiecewisePointHandleItem.cxx @@ -31,6 +31,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN enum enumPointHandleType { enSharpNess = 0, @@ -427,3 +428,4 @@ void vtkPiecewisePointHandleItem::PrintSelf(ostream& os, vtkIndent indent) os << indent << "MouseOverHandleIndex: " << this->MouseOverHandleIndex << endl; os << indent << "CurrentPointIndex: " << this->CurrentPointIndex << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPiecewisePointHandleItem.h b/Charts/Core/vtkPiecewisePointHandleItem.h index fbf8f212e0..6f6f51317b 100644 --- a/Charts/Core/vtkPiecewisePointHandleItem.h +++ b/Charts/Core/vtkPiecewisePointHandleItem.h @@ -31,6 +31,7 @@ #include "vtkContextItem.h" #include "vtkWeakPointer.h" // Needed for weak pointer to the PiecewiseFunction. +VTK_ABI_NAMESPACE_BEGIN class vtkContext2D; class vtkPiecewiseFunction; class vtkCallbackCommand; @@ -121,4 +122,5 @@ private: InternalPiecewisePointHandleInfo* Internal; }; +VTK_ABI_NAMESPACE_END #endif // vtkPiecewisePointHandleItem_h diff --git a/Charts/Core/vtkPlot.cxx b/Charts/Core/vtkPlot.cxx index 8236a25d0f..bcd13cca1f 100644 --- a/Charts/Core/vtkPlot.cxx +++ b/Charts/Core/vtkPlot.cxx @@ -30,6 +30,7 @@ #include "vtkTransform2D.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkPlot, XAxis, vtkAxis); vtkCxxSetObjectMacro(vtkPlot, YAxis, vtkAxis); @@ -714,3 +715,4 @@ bool vtkPlot::Hit(const vtkContextMouseEvent& mouse) vtkIdType segmentId; return this->GetNearestPoint(mouse.GetPos(), tol, &loc, &segmentId) >= 0; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlot.h b/Charts/Core/vtkPlot.h index 58f82cc0ce..cd0e15ff01 100644 --- a/Charts/Core/vtkPlot.h +++ b/Charts/Core/vtkPlot.h @@ -35,6 +35,7 @@ #include "vtkSmartPointer.h" // Needed to hold SP ivars #include "vtkStdString.h" // Needed to hold TooltipLabelFormat ivar +VTK_ABI_NAMESPACE_BEGIN class vtkVariant; class vtkTable; class vtkIdTypeArray; @@ -561,4 +562,5 @@ private: void operator=(const vtkPlot&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlot_h diff --git a/Charts/Core/vtkPlot3D.cxx b/Charts/Core/vtkPlot3D.cxx index 162d91863b..fc8f7ae732 100644 --- a/Charts/Core/vtkPlot3D.cxx +++ b/Charts/Core/vtkPlot3D.cxx @@ -24,6 +24,7 @@ #include "vtkStringArray.h" #include "vtkTable.h" +VTK_ABI_NAMESPACE_BEGIN namespace { // FIXME: Put this in a central header, as it is used across several classes. @@ -346,3 +347,4 @@ std::vector vtkPlot3D::GetPoints() { return this->Points; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlot3D.h b/Charts/Core/vtkPlot3D.h index 2830fe007e..da3a0bfa2f 100644 --- a/Charts/Core/vtkPlot3D.h +++ b/Charts/Core/vtkPlot3D.h @@ -34,6 +34,7 @@ #include "vtkVector.h" // For Points ivar #include // For ivars +VTK_ABI_NAMESPACE_BEGIN class vtkChartXYZ; class vtkDataArray; class vtkIdTypeArray; @@ -199,4 +200,5 @@ private: void operator=(const vtkPlot3D&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlot3D_h diff --git a/Charts/Core/vtkPlotArea.cxx b/Charts/Core/vtkPlotArea.cxx index 90d8e74b24..2037b83eba 100644 --- a/Charts/Core/vtkPlotArea.cxx +++ b/Charts/Core/vtkPlotArea.cxx @@ -37,6 +37,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN namespace { inline bool vtkIsBadPoint(const vtkVector2f& vec) @@ -667,3 +668,4 @@ void vtkPlotArea::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotArea.h b/Charts/Core/vtkPlotArea.h index 858a1778c4..52c3ccbf0b 100644 --- a/Charts/Core/vtkPlotArea.h +++ b/Charts/Core/vtkPlotArea.h @@ -28,6 +28,7 @@ #include "vtkPlot.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCHARTSCORE_EXPORT vtkPlotArea : public vtkPlot { public: @@ -130,4 +131,5 @@ private: vtkTimeStamp UpdateTime; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkPlotBag.cxx b/Charts/Core/vtkPlotBag.cxx index 3a92c1e0de..d0c22497aa 100644 --- a/Charts/Core/vtkPlotBag.cxx +++ b/Charts/Core/vtkPlotBag.cxx @@ -34,6 +34,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotBag); vtkSetObjectImplementationMacro(vtkPlotBag, LinePen, vtkPen); @@ -455,3 +456,4 @@ void vtkPlotBag::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotBag.h b/Charts/Core/vtkPlotBag.h index ef4e899014..104d40e65d 100644 --- a/Charts/Core/vtkPlotBag.h +++ b/Charts/Core/vtkPlotBag.h @@ -36,6 +36,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkPlotPoints.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPen; class VTKCHARTSCORE_EXPORT vtkPlotBag : public vtkPlotPoints @@ -140,4 +141,5 @@ private: void operator=(const vtkPlotBag&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotBag_h diff --git a/Charts/Core/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx index d890d60edc..a68a26c0ec 100644 --- a/Charts/Core/vtkPlotBar.cxx +++ b/Charts/Core/vtkPlotBar.cxx @@ -44,6 +44,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -1100,3 +1101,4 @@ void vtkPlotBar::GetDataBounds(double bounds[2]) table->GetRowData()->GetRange(x->GetName(), bounds); } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotBar.h b/Charts/Core/vtkPlotBar.h index c2acdb2478..e525e11760 100644 --- a/Charts/Core/vtkPlotBar.h +++ b/Charts/Core/vtkPlotBar.h @@ -29,6 +29,7 @@ #include "vtkPlot.h" #include "vtkSmartPointer.h" // Needed to hold ColorSeries +VTK_ABI_NAMESPACE_BEGIN class vtkContext2D; class vtkTable; class vtkPoints2D; @@ -323,4 +324,5 @@ private: vtkPlotBarPrivate* Private; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotBar_h diff --git a/Charts/Core/vtkPlotBarRangeHandlesItem.cxx b/Charts/Core/vtkPlotBarRangeHandlesItem.cxx index 7077a888ef..d65eb2c446 100644 --- a/Charts/Core/vtkPlotBarRangeHandlesItem.cxx +++ b/Charts/Core/vtkPlotBarRangeHandlesItem.cxx @@ -3,6 +3,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotBarRangeHandlesItem); //------------------------------------------------------------------------------ @@ -99,3 +100,4 @@ void vtkPlotBarRangeHandlesItem::PrintSelf(ostream& os, vtkIndent indent) os << "(none)" << endl; } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotBarRangeHandlesItem.h b/Charts/Core/vtkPlotBarRangeHandlesItem.h index 3eba807969..8a30000a84 100644 --- a/Charts/Core/vtkPlotBarRangeHandlesItem.h +++ b/Charts/Core/vtkPlotBarRangeHandlesItem.h @@ -35,6 +35,7 @@ #include "vtkPlotRangeHandlesItem.h" #include "vtkSmartPointer.h" // Needed for vtkSmartPointer attribute +VTK_ABI_NAMESPACE_BEGIN class VTKCHARTSCORE_EXPORT vtkPlotBarRangeHandlesItem : public vtkPlotRangeHandlesItem { public: @@ -72,4 +73,5 @@ private: vtkSmartPointer PlotBar; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotBarRangeHandlesItem_h diff --git a/Charts/Core/vtkPlotBox.cxx b/Charts/Core/vtkPlotBox.cxx index 9ef7f0a64f..187bfa11f0 100644 --- a/Charts/Core/vtkPlotBox.cxx +++ b/Charts/Core/vtkPlotBox.cxx @@ -42,6 +42,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN class vtkPlotBox::Private : public std::vector> { public: @@ -401,3 +402,4 @@ void vtkPlotBox::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotBox.h b/Charts/Core/vtkPlotBox.h index a7f0e33897..b5f6ec5512 100644 --- a/Charts/Core/vtkPlotBox.h +++ b/Charts/Core/vtkPlotBox.h @@ -28,6 +28,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkPlot.h" +VTK_ABI_NAMESPACE_BEGIN class vtkBrush; class vtkTextProperty; class vtkTable; @@ -160,4 +161,5 @@ private: void operator=(const vtkPlotBox&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotBox_h diff --git a/Charts/Core/vtkPlotFunctionalBag.cxx b/Charts/Core/vtkPlotFunctionalBag.cxx index fd8bce4aa3..8a640c9aec 100644 --- a/Charts/Core/vtkPlotFunctionalBag.cxx +++ b/Charts/Core/vtkPlotFunctionalBag.cxx @@ -32,6 +32,7 @@ #include "vtkTable.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotFunctionalBag); //------------------------------------------------------------------------------ @@ -356,3 +357,4 @@ void vtkPlotFunctionalBag::CreateDefaultLookupTable() this->LookupTable->Register(this); this->LookupTable->Delete(); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotFunctionalBag.h b/Charts/Core/vtkPlotFunctionalBag.h index 6d6dce72bf..74da4ea851 100644 --- a/Charts/Core/vtkPlotFunctionalBag.h +++ b/Charts/Core/vtkPlotFunctionalBag.h @@ -36,6 +36,7 @@ #include "vtkNew.h" // Needed to hold SP ivars #include "vtkPlot.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkPlotFuntionalBagInternal; class vtkPlotLine; @@ -165,4 +166,5 @@ private: void operator=(const vtkPlotFunctionalBag&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotFunctionalBag_h diff --git a/Charts/Core/vtkPlotGrid.cxx b/Charts/Core/vtkPlotGrid.cxx index aa821b2cdb..e11ac73698 100644 --- a/Charts/Core/vtkPlotGrid.cxx +++ b/Charts/Core/vtkPlotGrid.cxx @@ -25,6 +25,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkPlotGrid, XAxis, vtkAxis); vtkCxxSetObjectMacro(vtkPlotGrid, YAxis, vtkAxis); //------------------------------------------------------------------------------ @@ -92,3 +93,4 @@ void vtkPlotGrid::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotGrid.h b/Charts/Core/vtkPlotGrid.h index da5163e21b..6473118fe9 100644 --- a/Charts/Core/vtkPlotGrid.h +++ b/Charts/Core/vtkPlotGrid.h @@ -30,6 +30,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkContextItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkContext2D; class vtkPoints2D; class vtkAxis; @@ -78,4 +79,5 @@ private: void operator=(const vtkPlotGrid&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotGrid_h diff --git a/Charts/Core/vtkPlotHistogram2D.cxx b/Charts/Core/vtkPlotHistogram2D.cxx index deac5ce99b..59e48f444f 100644 --- a/Charts/Core/vtkPlotHistogram2D.cxx +++ b/Charts/Core/vtkPlotHistogram2D.cxx @@ -28,6 +28,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotHistogram2D); //------------------------------------------------------------------------------ @@ -284,3 +285,4 @@ void vtkPlotHistogram2D::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotHistogram2D.h b/Charts/Core/vtkPlotHistogram2D.h index 3461c15ee2..7444b7e757 100644 --- a/Charts/Core/vtkPlotHistogram2D.h +++ b/Charts/Core/vtkPlotHistogram2D.h @@ -29,6 +29,7 @@ #include "vtkRect.h" // Needed for vtkRectf #include "vtkSmartPointer.h" // Needed for SP ivars +VTK_ABI_NAMESPACE_BEGIN class vtkImageData; class vtkScalarsToColors; @@ -140,4 +141,5 @@ private: void operator=(const vtkPlotHistogram2D&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotHistogram2D_h diff --git a/Charts/Core/vtkPlotLine.cxx b/Charts/Core/vtkPlotLine.cxx index a081bf3040..70b4f33187 100644 --- a/Charts/Core/vtkPlotLine.cxx +++ b/Charts/Core/vtkPlotLine.cxx @@ -24,6 +24,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotLine); //------------------------------------------------------------------------------ @@ -120,3 +121,4 @@ void vtkPlotLine::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotLine.h b/Charts/Core/vtkPlotLine.h index dd6162efa9..b621e83910 100644 --- a/Charts/Core/vtkPlotLine.h +++ b/Charts/Core/vtkPlotLine.h @@ -28,6 +28,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkPlotPoints.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCHARTSCORE_EXPORT vtkPlotLine : public vtkPlotPoints { public: @@ -79,4 +80,5 @@ private: void operator=(const vtkPlotLine&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotLine_h diff --git a/Charts/Core/vtkPlotLine3D.cxx b/Charts/Core/vtkPlotLine3D.cxx index c69953d640..9c5919fe45 100644 --- a/Charts/Core/vtkPlotLine3D.cxx +++ b/Charts/Core/vtkPlotLine3D.cxx @@ -22,6 +22,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotLine3D); //------------------------------------------------------------------------------ @@ -60,3 +61,4 @@ void vtkPlotLine3D::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotLine3D.h b/Charts/Core/vtkPlotLine3D.h index c31ad5bb0e..a5ad80ff6b 100644 --- a/Charts/Core/vtkPlotLine3D.h +++ b/Charts/Core/vtkPlotLine3D.h @@ -34,6 +34,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkPlotPoints3D.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCHARTSCORE_EXPORT vtkPlotLine3D : public vtkPlotPoints3D { public: @@ -59,4 +60,5 @@ private: void operator=(const vtkPlotLine3D&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotLine3D_h diff --git a/Charts/Core/vtkPlotParallelCoordinates.cxx b/Charts/Core/vtkPlotParallelCoordinates.cxx index 4db4a86c4b..9fa63f1c93 100644 --- a/Charts/Core/vtkPlotParallelCoordinates.cxx +++ b/Charts/Core/vtkPlotParallelCoordinates.cxx @@ -43,6 +43,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN class vtkPlotParallelCoordinates::Private : public std::vector> { public: @@ -510,3 +511,4 @@ void vtkPlotParallelCoordinates::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotParallelCoordinates.h b/Charts/Core/vtkPlotParallelCoordinates.h index 774d0a96e1..72393d8eb7 100644 --- a/Charts/Core/vtkPlotParallelCoordinates.h +++ b/Charts/Core/vtkPlotParallelCoordinates.h @@ -30,6 +30,7 @@ #include "vtkScalarsToColors.h" // For VTK_COLOR_MODE_DEFAULT and _MAP_SCALARS #include "vtkStdString.h" // For vtkStdString ivars +VTK_ABI_NAMESPACE_BEGIN class vtkChartParallelCoordinates; class vtkScalarsToColors; class vtkTable; @@ -165,4 +166,5 @@ private: void operator=(const vtkPlotParallelCoordinates&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotParallelCoordinates_h diff --git a/Charts/Core/vtkPlotPie.cxx b/Charts/Core/vtkPlotPie.cxx index 80a2e2fd19..360765129b 100644 --- a/Charts/Core/vtkPlotPie.cxx +++ b/Charts/Core/vtkPlotPie.cxx @@ -29,6 +29,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -248,3 +249,4 @@ bool vtkPlotPie::UpdateCache() this->BuildTime.Modified(); return true; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotPie.h b/Charts/Core/vtkPlotPie.h index 5b872dc5fc..a4b0c1ed69 100644 --- a/Charts/Core/vtkPlotPie.h +++ b/Charts/Core/vtkPlotPie.h @@ -27,6 +27,7 @@ #include "vtkPlot.h" #include "vtkSmartPointer.h" // To hold ColorSeries etc. +VTK_ABI_NAMESPACE_BEGIN class vtkContext2D; class vtkColorSeries; class vtkPoints2D; @@ -124,4 +125,5 @@ private: vtkPlotPiePrivate* Private; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotPie_h diff --git a/Charts/Core/vtkPlotPoints.cxx b/Charts/Core/vtkPlotPoints.cxx index a5ef2d9a69..6d6d7374c8 100644 --- a/Charts/Core/vtkPlotPoints.cxx +++ b/Charts/Core/vtkPlotPoints.cxx @@ -38,6 +38,7 @@ #include // PIMPL for STL vector... +VTK_ABI_NAMESPACE_BEGIN struct vtkIndexedVector2f { size_t index; @@ -966,3 +967,4 @@ void vtkPlotPoints::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotPoints.h b/Charts/Core/vtkPlotPoints.h index 1ee0761cc8..c803f57bc7 100644 --- a/Charts/Core/vtkPlotPoints.h +++ b/Charts/Core/vtkPlotPoints.h @@ -37,6 +37,7 @@ #include "vtkScalarsToColors.h" // For VTK_COLOR_MODE_DEFAULT and _MAP_SCALARS #include "vtkStdString.h" // For color array name +VTK_ABI_NAMESPACE_BEGIN class vtkCharArray; class vtkContext2D; class vtkTable; @@ -289,4 +290,5 @@ private: void operator=(const vtkPlotPoints&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotPoints_h diff --git a/Charts/Core/vtkPlotPoints3D.cxx b/Charts/Core/vtkPlotPoints3D.cxx index 087e88be4e..2897dad0f5 100644 --- a/Charts/Core/vtkPlotPoints3D.cxx +++ b/Charts/Core/vtkPlotPoints3D.cxx @@ -24,6 +24,7 @@ #include "vtkUnsignedCharArray.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotPoints3D); //------------------------------------------------------------------------------ @@ -104,3 +105,4 @@ bool vtkPlotPoints3D::Paint(vtkContext2D* painter) return true; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotPoints3D.h b/Charts/Core/vtkPlotPoints3D.h index 7c5d4dd34f..82ffdc6722 100644 --- a/Charts/Core/vtkPlotPoints3D.h +++ b/Charts/Core/vtkPlotPoints3D.h @@ -32,6 +32,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkPlot3D.h" +VTK_ABI_NAMESPACE_BEGIN class vtkContext2D; class VTKCHARTSCORE_EXPORT vtkPlotPoints3D : public vtkPlot3D @@ -65,4 +66,5 @@ private: void operator=(const vtkPlotPoints3D&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotPoints3D_h diff --git a/Charts/Core/vtkPlotRangeHandlesItem.cxx b/Charts/Core/vtkPlotRangeHandlesItem.cxx index 13e4d6efa7..26c2194767 100644 --- a/Charts/Core/vtkPlotRangeHandlesItem.cxx +++ b/Charts/Core/vtkPlotRangeHandlesItem.cxx @@ -32,6 +32,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotRangeHandlesItem); //------------------------------------------------------------------------------ @@ -634,3 +635,4 @@ void vtkPlotRangeHandlesItem::SetCursor(int cursor) } } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotRangeHandlesItem.h b/Charts/Core/vtkPlotRangeHandlesItem.h index a67b9b8762..8ae21ca0a0 100644 --- a/Charts/Core/vtkPlotRangeHandlesItem.h +++ b/Charts/Core/vtkPlotRangeHandlesItem.h @@ -43,6 +43,7 @@ #include "vtkCommand.h" // For vtkCommand enum #include "vtkPlot.h" +VTK_ABI_NAMESPACE_BEGIN class vtkBrush; class VTKCHARTSCORE_EXPORT vtkPlotRangeHandlesItem : public vtkPlot @@ -253,4 +254,5 @@ protected: int HandleOrientation = VERTICAL; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotRangeHandlesItem_h diff --git a/Charts/Core/vtkPlotStacked.cxx b/Charts/Core/vtkPlotStacked.cxx index 606bc38cb9..936fb16cef 100644 --- a/Charts/Core/vtkPlotStacked.cxx +++ b/Charts/Core/vtkPlotStacked.cxx @@ -39,6 +39,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -809,3 +810,4 @@ vtkColorSeries* vtkPlotStacked::GetColorSeries() { return this->ColorSeries; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotStacked.h b/Charts/Core/vtkPlotStacked.h index 2ae7f20c90..11b259f8f2 100644 --- a/Charts/Core/vtkPlotStacked.h +++ b/Charts/Core/vtkPlotStacked.h @@ -28,6 +28,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkPlot.h" +VTK_ABI_NAMESPACE_BEGIN class vtkChartXY; class vtkContext2D; class vtkTable; @@ -187,4 +188,5 @@ private: vtkPlotStackedPrivate* Private; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotStacked_h diff --git a/Charts/Core/vtkPlotSurface.cxx b/Charts/Core/vtkPlotSurface.cxx index e813c6114d..234ab8a989 100644 --- a/Charts/Core/vtkPlotSurface.cxx +++ b/Charts/Core/vtkPlotSurface.cxx @@ -25,6 +25,7 @@ #include "vtkUnsignedCharArray.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlotSurface); //------------------------------------------------------------------------------ @@ -286,3 +287,4 @@ float vtkPlotSurface::RowToY(int rowIndex) float newRange = this->YMaximum - this->YMinimum; return static_cast(rowIndex) * (newRange / this->NumberOfRows) + this->YMinimum; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkPlotSurface.h b/Charts/Core/vtkPlotSurface.h index dddffcedb5..645f4a9335 100644 --- a/Charts/Core/vtkPlotSurface.h +++ b/Charts/Core/vtkPlotSurface.h @@ -29,6 +29,7 @@ #include "vtkNew.h" // For vtkNew ivar #include "vtkPlot3D.h" +VTK_ABI_NAMESPACE_BEGIN class vtkContext2D; class vtkLookupTable; class vtkTable; @@ -165,4 +166,5 @@ private: void operator=(const vtkPlotSurface&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPlotSurface_h diff --git a/Charts/Core/vtkRangeHandlesItem.cxx b/Charts/Core/vtkRangeHandlesItem.cxx index 815d539c38..ee0736897d 100644 --- a/Charts/Core/vtkRangeHandlesItem.cxx +++ b/Charts/Core/vtkRangeHandlesItem.cxx @@ -28,6 +28,7 @@ #include "vtkTransform2D.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkRangeHandlesItem); vtkCxxSetObjectMacro(vtkRangeHandlesItem, ColorTransferFunction, vtkColorTransferFunction); @@ -159,3 +160,4 @@ void vtkRangeHandlesItem::SetActiveHandlePosition(double position) this->TransformScreenToData(position, 1, this->ActiveHandleRangeValue, unused); } } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkRangeHandlesItem.h b/Charts/Core/vtkRangeHandlesItem.h index 0e5689eb48..daabb48f51 100644 --- a/Charts/Core/vtkRangeHandlesItem.h +++ b/Charts/Core/vtkRangeHandlesItem.h @@ -39,6 +39,7 @@ #include "vtkChartsCoreModule.h" // For export macro #include "vtkPlotRangeHandlesItem.h" +VTK_ABI_NAMESPACE_BEGIN class vtkColorTransferFunction; class VTKCHARTSCORE_EXPORT vtkRangeHandlesItem : public vtkPlotRangeHandlesItem @@ -116,4 +117,5 @@ private: vtkColorTransferFunction* ColorTransferFunction = nullptr; }; +VTK_ABI_NAMESPACE_END #endif // vtkRangeHandlesItem_h diff --git a/Charts/Core/vtkScalarsToColorsItem.cxx b/Charts/Core/vtkScalarsToColorsItem.cxx index 3529f7ec3d..0fbc524750 100644 --- a/Charts/Core/vtkScalarsToColorsItem.cxx +++ b/Charts/Core/vtkScalarsToColorsItem.cxx @@ -36,6 +36,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkScalarsToColorsItem, HistogramTable, vtkTable); //------------------------------------------------------------------------------ @@ -273,3 +274,4 @@ vtkStdString vtkScalarsToColorsItem::GetTooltipLabel( } return ""; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkScalarsToColorsItem.h b/Charts/Core/vtkScalarsToColorsItem.h index b75bcf1195..0f8f07a3c8 100644 --- a/Charts/Core/vtkScalarsToColorsItem.h +++ b/Charts/Core/vtkScalarsToColorsItem.h @@ -34,6 +34,7 @@ #include "vtkNew.h" // For vtkNew #include "vtkPlot.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCallbackCommand; class vtkImageData; class vtkPlotBar; @@ -170,4 +171,5 @@ private: void operator=(const vtkScalarsToColorsItem&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Charts/Core/vtkScatterPlotMatrix.cxx b/Charts/Core/vtkScatterPlotMatrix.cxx index b2f404becf..e38cd6d29b 100644 --- a/Charts/Core/vtkScatterPlotMatrix.cxx +++ b/Charts/Core/vtkScatterPlotMatrix.cxx @@ -50,6 +50,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN class vtkScatterPlotMatrix::PIMPL { public: @@ -1991,3 +1992,4 @@ void vtkScatterPlotMatrix::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Title: " << this->Title << endl; os << indent << "SelectionMode: " << this->SelectionMode << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Charts/Core/vtkScatterPlotMatrix.h b/Charts/Core/vtkScatterPlotMatrix.h index 6233204d5b..afa9d20a2c 100644 --- a/Charts/Core/vtkScatterPlotMatrix.h +++ b/Charts/Core/vtkScatterPlotMatrix.h @@ -34,6 +34,7 @@ #include "vtkStdString.h" // For ivars #include "vtkWeakPointer.h" // For currentPainter +VTK_ABI_NAMESPACE_BEGIN class vtkStringArray; class vtkTable; class vtkAxis; @@ -506,4 +507,5 @@ private: void ApplyAxisSetting(vtkChart* chart, const vtkStdString& x, const vtkStdString& y); }; +VTK_ABI_NAMESPACE_END #endif // vtkScatterPlotMatrix_h diff --git a/Common/Archive/vtkBufferedArchiver.cxx b/Common/Archive/vtkBufferedArchiver.cxx index f9a85a1a88..ee365b20f5 100644 --- a/Common/Archive/vtkBufferedArchiver.cxx +++ b/Common/Archive/vtkBufferedArchiver.cxx @@ -21,6 +21,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN struct vtkBufferedArchiver::Internal { struct archive* Archive; @@ -133,3 +134,4 @@ void vtkBufferedArchiver::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Archive/vtkBufferedArchiver.h b/Common/Archive/vtkBufferedArchiver.h index f2132e36a9..68c1b7bfad 100644 --- a/Common/Archive/vtkBufferedArchiver.h +++ b/Common/Archive/vtkBufferedArchiver.h @@ -30,6 +30,7 @@ #include "vtkArchiver.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONARCHIVE_EXPORT vtkBufferedArchiver : public vtkArchiver { public: @@ -107,4 +108,5 @@ private: void operator=(const vtkBufferedArchiver&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Archive/vtkPartitionedArchiver.cxx b/Common/Archive/vtkPartitionedArchiver.cxx index 7990cbddf9..a0ab657ff8 100644 --- a/Common/Archive/vtkPartitionedArchiver.cxx +++ b/Common/Archive/vtkPartitionedArchiver.cxx @@ -23,6 +23,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN struct vtkPartitionedArchiver::Internal { std::map> Buffers; @@ -179,3 +180,4 @@ void vtkPartitionedArchiver::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Archive/vtkPartitionedArchiver.h b/Common/Archive/vtkPartitionedArchiver.h index 2a40b65ca1..56bba6bcfb 100644 --- a/Common/Archive/vtkPartitionedArchiver.h +++ b/Common/Archive/vtkPartitionedArchiver.h @@ -31,6 +31,7 @@ #include "vtkArchiver.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONARCHIVE_EXPORT vtkPartitionedArchiver : public vtkArchiver { public: @@ -114,4 +115,5 @@ private: void operator=(const vtkPartitionedArchiver&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Color/vtkColorSeries.cxx b/Common/Color/vtkColorSeries.cxx index 72a3ab1f3b..36aed54452 100644 --- a/Common/Color/vtkColorSeries.cxx +++ b/Common/Color/vtkColorSeries.cxx @@ -22,6 +22,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN class vtkColorSeriesPalette { public: @@ -602,3 +603,4 @@ void vtkColorSeries::CopyOnWrite() this->Modified(); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Color/vtkColorSeries.h b/Common/Color/vtkColorSeries.h index 7a095a4bbc..45a275d280 100644 --- a/Common/Color/vtkColorSeries.h +++ b/Common/Color/vtkColorSeries.h @@ -53,6 +53,7 @@ #include "vtkObject.h" #include "vtkStdString.h" // Needed for arguments +VTK_ABI_NAMESPACE_BEGIN class vtkLookupTable; class VTKCOMMONCOLOR_EXPORT vtkColorSeries : public vtkObject @@ -351,4 +352,5 @@ private: void operator=(const vtkColorSeries&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkColorSeries_h diff --git a/Common/Color/vtkNamedColors.cxx b/Common/Color/vtkNamedColors.cxx index 984449e3ed..fc02161fe9 100644 --- a/Common/Color/vtkNamedColors.cxx +++ b/Common/Color/vtkNamedColors.cxx @@ -26,6 +26,7 @@ #include // STL Header for parsing character arrays #include // STL Header for returning/storing color values +VTK_ABI_NAMESPACE_BEGIN class vtkNamedColorsDataStore { public: @@ -1301,3 +1302,4 @@ vtkStdString vtkNamedColors::RGBAToHTMLColor(const vtkColor4ub& rgba) << (int)(rgba.GetBlue()) << "," << (rgba.GetAlpha() / 255.0) << ")"; return ss.str(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Color/vtkNamedColors.h b/Common/Color/vtkNamedColors.h index 7b683cb615..45393b39e0 100644 --- a/Common/Color/vtkNamedColors.h +++ b/Common/Color/vtkNamedColors.h @@ -74,6 +74,7 @@ #include "vtkStdString.h" // Needed for arguments #include "vtkStringArray.h" // For returning color names +VTK_ABI_NAMESPACE_BEGIN class vtkNamedColorsDataStore; class vtkColorStringParser; @@ -400,4 +401,5 @@ private: void operator=(const vtkNamedColors&) = delete; }; +VTK_ABI_NAMESPACE_END #endif /* vtkNamedColors_h */ diff --git a/Common/ComputationalGeometry/vtkBilinearQuadIntersection.cxx b/Common/ComputationalGeometry/vtkBilinearQuadIntersection.cxx index 47caa14bfb..9187993694 100644 --- a/Common/ComputationalGeometry/vtkBilinearQuadIntersection.cxx +++ b/Common/ComputationalGeometry/vtkBilinearQuadIntersection.cxx @@ -45,6 +45,7 @@ DEALINGS IN THE SOFTWARE. #define RAY_EPSILON 1e-12 // some small epsilon for flt pt +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -303,3 +304,4 @@ bool vtkBilinearQuadIntersection::RayIntersection( return false; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkBilinearQuadIntersection.h b/Common/ComputationalGeometry/vtkBilinearQuadIntersection.h index bc01757e87..e66289a15c 100644 --- a/Common/ComputationalGeometry/vtkBilinearQuadIntersection.h +++ b/Common/ComputationalGeometry/vtkBilinearQuadIntersection.h @@ -27,6 +27,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkVector.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkBilinearQuadIntersection { public: @@ -62,5 +63,6 @@ private: vtkVector3d Point11; int AxesSwapping = 0; }; +VTK_ABI_NAMESPACE_END #endif // vtkBilinearQuadIntersection_h // VTK-HeaderTest-Exclude: vtkBilinearQuadIntersection.h diff --git a/Common/ComputationalGeometry/vtkCardinalSpline.cxx b/Common/ComputationalGeometry/vtkCardinalSpline.cxx index c171e5b08a..1c4061b14b 100644 --- a/Common/ComputationalGeometry/vtkCardinalSpline.cxx +++ b/Common/ComputationalGeometry/vtkCardinalSpline.cxx @@ -20,6 +20,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCardinalSpline); //------------------------------------------------------------------------------ @@ -422,3 +423,4 @@ void vtkCardinalSpline::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkCardinalSpline.h b/Common/ComputationalGeometry/vtkCardinalSpline.h index 0351ac7f51..bce6a04b1b 100644 --- a/Common/ComputationalGeometry/vtkCardinalSpline.h +++ b/Common/ComputationalGeometry/vtkCardinalSpline.h @@ -31,6 +31,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkSpline.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkCardinalSpline : public vtkSpline { public: @@ -68,4 +69,5 @@ private: void operator=(const vtkCardinalSpline&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkKochanekSpline.cxx b/Common/ComputationalGeometry/vtkKochanekSpline.cxx index 44c84068da..228f3bdede 100644 --- a/Common/ComputationalGeometry/vtkKochanekSpline.cxx +++ b/Common/ComputationalGeometry/vtkKochanekSpline.cxx @@ -19,6 +19,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkKochanekSpline); //------------------------------------------------------------------------------ @@ -366,3 +367,4 @@ void vtkKochanekSpline::PrintSelf(ostream& os, vtkIndent indent) os << indent << "DefaultTension: " << this->DefaultTension << "\n"; os << indent << "DefaultContinuity: " << this->DefaultContinuity << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkKochanekSpline.h b/Common/ComputationalGeometry/vtkKochanekSpline.h index 5e4ae24421..804936a6c4 100644 --- a/Common/ComputationalGeometry/vtkKochanekSpline.h +++ b/Common/ComputationalGeometry/vtkKochanekSpline.h @@ -48,6 +48,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkSpline.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkKochanekSpline : public vtkSpline { public: @@ -116,4 +117,5 @@ private: void operator=(const vtkKochanekSpline&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricBohemianDome.cxx b/Common/ComputationalGeometry/vtkParametricBohemianDome.cxx index 7454f0ce7a..448b6d430a 100644 --- a/Common/ComputationalGeometry/vtkParametricBohemianDome.cxx +++ b/Common/ComputationalGeometry/vtkParametricBohemianDome.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricBohemianDome); //----------------------------------------------------------------------------// vtkParametricBohemianDome::vtkParametricBohemianDome() @@ -87,3 +88,4 @@ void vtkParametricBohemianDome::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricBohemianDome.h b/Common/ComputationalGeometry/vtkParametricBohemianDome.h index d38f8e1efd..49cf190a0e 100644 --- a/Common/ComputationalGeometry/vtkParametricBohemianDome.h +++ b/Common/ComputationalGeometry/vtkParametricBohemianDome.h @@ -32,6 +32,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBohemianDome : public vtkParametricFunction { public: @@ -95,4 +96,5 @@ private: void operator=(const vtkParametricBohemianDome&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricBour.cxx b/Common/ComputationalGeometry/vtkParametricBour.cxx index c333b2e960..bb2843e632 100644 --- a/Common/ComputationalGeometry/vtkParametricBour.cxx +++ b/Common/ComputationalGeometry/vtkParametricBour.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricBour); //----------------------------------------------------------------------------// vtkParametricBour::vtkParametricBour() @@ -77,3 +78,4 @@ void vtkParametricBour::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricBour.h b/Common/ComputationalGeometry/vtkParametricBour.h index 5e082c116c..235a71b653 100644 --- a/Common/ComputationalGeometry/vtkParametricBour.h +++ b/Common/ComputationalGeometry/vtkParametricBour.h @@ -29,6 +29,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBour : public vtkParametricFunction { public: @@ -76,4 +77,5 @@ private: void operator=(const vtkParametricBour&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricBoy.cxx b/Common/ComputationalGeometry/vtkParametricBoy.cxx index 2bdaa6d7e7..30323af154 100644 --- a/Common/ComputationalGeometry/vtkParametricBoy.cxx +++ b/Common/ComputationalGeometry/vtkParametricBoy.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricBoy); //------------------------------------------------------------------------------ @@ -117,3 +118,4 @@ void vtkParametricBoy::PrintSelf(ostream& os, vtkIndent indent) os << indent << "ZScale: " << this->ZScale << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricBoy.h b/Common/ComputationalGeometry/vtkParametricBoy.h index 5613ec0f3d..87f8a8249f 100644 --- a/Common/ComputationalGeometry/vtkParametricBoy.h +++ b/Common/ComputationalGeometry/vtkParametricBoy.h @@ -36,6 +36,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBoy : public vtkParametricFunction { public: @@ -105,4 +106,5 @@ private: void operator=(const vtkParametricBoy&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricCatalanMinimal.cxx b/Common/ComputationalGeometry/vtkParametricCatalanMinimal.cxx index 213297bb0e..e6a3e4a3aa 100644 --- a/Common/ComputationalGeometry/vtkParametricCatalanMinimal.cxx +++ b/Common/ComputationalGeometry/vtkParametricCatalanMinimal.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricCatalanMinimal); //----------------------------------------------------------------------------// vtkParametricCatalanMinimal::vtkParametricCatalanMinimal() @@ -77,3 +78,4 @@ void vtkParametricCatalanMinimal::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricCatalanMinimal.h b/Common/ComputationalGeometry/vtkParametricCatalanMinimal.h index 0c077ccd42..fde73f76af 100644 --- a/Common/ComputationalGeometry/vtkParametricCatalanMinimal.h +++ b/Common/ComputationalGeometry/vtkParametricCatalanMinimal.h @@ -30,6 +30,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricCatalanMinimal : public vtkParametricFunction { @@ -78,4 +79,5 @@ private: void operator=(const vtkParametricCatalanMinimal&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricConicSpiral.cxx b/Common/ComputationalGeometry/vtkParametricConicSpiral.cxx index 52602ddc0b..7d3bd4e0a6 100644 --- a/Common/ComputationalGeometry/vtkParametricConicSpiral.cxx +++ b/Common/ComputationalGeometry/vtkParametricConicSpiral.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricConicSpiral); //------------------------------------------------------------------------------ @@ -91,3 +92,4 @@ void vtkParametricConicSpiral::PrintSelf(ostream& os, vtkIndent indent) os << indent << "C: " << this->C << "\n"; os << indent << "N: " << this->N << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricConicSpiral.h b/Common/ComputationalGeometry/vtkParametricConicSpiral.h index 515d4f064b..60b88e3e42 100644 --- a/Common/ComputationalGeometry/vtkParametricConicSpiral.h +++ b/Common/ComputationalGeometry/vtkParametricConicSpiral.h @@ -35,6 +35,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricConicSpiral : public vtkParametricFunction { public: @@ -137,4 +138,5 @@ private: void operator=(const vtkParametricConicSpiral&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricCrossCap.cxx b/Common/ComputationalGeometry/vtkParametricCrossCap.cxx index 40f1ee2520..6b2eaf02da 100644 --- a/Common/ComputationalGeometry/vtkParametricCrossCap.cxx +++ b/Common/ComputationalGeometry/vtkParametricCrossCap.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricCrossCap); //------------------------------------------------------------------------------ @@ -79,3 +80,4 @@ void vtkParametricCrossCap::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricCrossCap.h b/Common/ComputationalGeometry/vtkParametricCrossCap.h index f9d3ab0a91..c6ae18be68 100644 --- a/Common/ComputationalGeometry/vtkParametricCrossCap.h +++ b/Common/ComputationalGeometry/vtkParametricCrossCap.h @@ -36,6 +36,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricCrossCap : public vtkParametricFunction { public: @@ -92,4 +93,5 @@ private: void operator=(const vtkParametricCrossCap&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricDini.cxx b/Common/ComputationalGeometry/vtkParametricDini.cxx index 49cb32f38a..b2ab4be3de 100644 --- a/Common/ComputationalGeometry/vtkParametricDini.cxx +++ b/Common/ComputationalGeometry/vtkParametricDini.cxx @@ -18,6 +18,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricDini); //------------------------------------------------------------------------------ @@ -102,3 +103,4 @@ void vtkParametricDini::PrintSelf(ostream& os, vtkIndent indent) os << indent << "A: " << this->A << "\n"; os << indent << "B: " << this->B << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricDini.h b/Common/ComputationalGeometry/vtkParametricDini.h index ce8a12dff7..ee9f7f9d7b 100644 --- a/Common/ComputationalGeometry/vtkParametricDini.h +++ b/Common/ComputationalGeometry/vtkParametricDini.h @@ -35,6 +35,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricDini : public vtkParametricFunction { public: @@ -116,4 +117,5 @@ private: void operator=(const vtkParametricDini&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx b/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx index 8c07778145..0b8f47ca0b 100644 --- a/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx +++ b/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx @@ -17,6 +17,7 @@ #include "vtkObjectFactory.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricEllipsoid); //------------------------------------------------------------------------------ @@ -89,3 +90,4 @@ void vtkParametricEllipsoid::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Y scale factor: " << this->YRadius << "\n"; os << indent << "Z scale factor: " << this->ZRadius << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricEllipsoid.h b/Common/ComputationalGeometry/vtkParametricEllipsoid.h index 6fed15d02e..33d19db653 100644 --- a/Common/ComputationalGeometry/vtkParametricEllipsoid.h +++ b/Common/ComputationalGeometry/vtkParametricEllipsoid.h @@ -39,6 +39,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEllipsoid : public vtkParametricFunction { public: @@ -128,4 +129,5 @@ private: void operator=(const vtkParametricEllipsoid&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricEnneper.cxx b/Common/ComputationalGeometry/vtkParametricEnneper.cxx index 5dc58a1351..a8069125e8 100644 --- a/Common/ComputationalGeometry/vtkParametricEnneper.cxx +++ b/Common/ComputationalGeometry/vtkParametricEnneper.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricEnneper); //------------------------------------------------------------------------------ @@ -72,3 +73,4 @@ void vtkParametricEnneper::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricEnneper.h b/Common/ComputationalGeometry/vtkParametricEnneper.h index 3a8129cff4..ca5949f6ca 100644 --- a/Common/ComputationalGeometry/vtkParametricEnneper.h +++ b/Common/ComputationalGeometry/vtkParametricEnneper.h @@ -36,6 +36,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEnneper : public vtkParametricFunction { public: @@ -92,4 +93,5 @@ private: void operator=(const vtkParametricEnneper&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricFigure8Klein.cxx b/Common/ComputationalGeometry/vtkParametricFigure8Klein.cxx index 90e172af5d..c28c64a4bc 100644 --- a/Common/ComputationalGeometry/vtkParametricFigure8Klein.cxx +++ b/Common/ComputationalGeometry/vtkParametricFigure8Klein.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricFigure8Klein); //------------------------------------------------------------------------------ @@ -84,3 +85,4 @@ void vtkParametricFigure8Klein::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Radius: " << this->Radius << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricFigure8Klein.h b/Common/ComputationalGeometry/vtkParametricFigure8Klein.h index 2bfc01f61e..1ce6b8b9da 100644 --- a/Common/ComputationalGeometry/vtkParametricFigure8Klein.h +++ b/Common/ComputationalGeometry/vtkParametricFigure8Klein.h @@ -43,6 +43,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricFigure8Klein : public vtkParametricFunction { public: @@ -111,4 +112,5 @@ private: void operator=(const vtkParametricFigure8Klein&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricFunction.cxx b/Common/ComputationalGeometry/vtkParametricFunction.cxx index 353489bf30..d31bd38088 100644 --- a/Common/ComputationalGeometry/vtkParametricFunction.cxx +++ b/Common/ComputationalGeometry/vtkParametricFunction.cxx @@ -15,6 +15,7 @@ #include "vtkParametricFunction.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkParametricFunction::vtkParametricFunction() : MinimumU(0.0) , MaximumU(1.0) @@ -61,3 +62,4 @@ void vtkParametricFunction::PrintSelf(ostream& os, vtkIndent indent) os << indent << "ClockwiseOrdering: " << this->ClockwiseOrdering << "\n"; os << indent << "Derivatives Available: " << this->DerivativesAvailable << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricFunction.h b/Common/ComputationalGeometry/vtkParametricFunction.h index bcf8657c8a..66f03ba344 100644 --- a/Common/ComputationalGeometry/vtkParametricFunction.h +++ b/Common/ComputationalGeometry/vtkParametricFunction.h @@ -59,6 +59,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricFunction : public vtkObject { public: @@ -266,4 +267,5 @@ private: void operator=(const vtkParametricFunction&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricHenneberg.cxx b/Common/ComputationalGeometry/vtkParametricHenneberg.cxx index 1af1b27cc2..3cb2765ba5 100644 --- a/Common/ComputationalGeometry/vtkParametricHenneberg.cxx +++ b/Common/ComputationalGeometry/vtkParametricHenneberg.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricHenneberg); //----------------------------------------------------------------------------// vtkParametricHenneberg::vtkParametricHenneberg() @@ -77,3 +78,4 @@ void vtkParametricHenneberg::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricHenneberg.h b/Common/ComputationalGeometry/vtkParametricHenneberg.h index 78a70aa78b..344077b3d6 100644 --- a/Common/ComputationalGeometry/vtkParametricHenneberg.h +++ b/Common/ComputationalGeometry/vtkParametricHenneberg.h @@ -29,6 +29,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricHenneberg : public vtkParametricFunction { public: @@ -76,4 +77,5 @@ private: void operator=(const vtkParametricHenneberg&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricKlein.cxx b/Common/ComputationalGeometry/vtkParametricKlein.cxx index 88ff6eabc0..568957f264 100644 --- a/Common/ComputationalGeometry/vtkParametricKlein.cxx +++ b/Common/ComputationalGeometry/vtkParametricKlein.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricKlein); //------------------------------------------------------------------------------ @@ -102,3 +103,4 @@ void vtkParametricKlein::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricKlein.h b/Common/ComputationalGeometry/vtkParametricKlein.h index f326e98a3e..1c168c99e3 100644 --- a/Common/ComputationalGeometry/vtkParametricKlein.h +++ b/Common/ComputationalGeometry/vtkParametricKlein.h @@ -43,6 +43,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKlein : public vtkParametricFunction { public: @@ -99,4 +100,5 @@ private: void operator=(const vtkParametricKlein&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricKuen.cxx b/Common/ComputationalGeometry/vtkParametricKuen.cxx index e4fc87449a..18c23c225a 100644 --- a/Common/ComputationalGeometry/vtkParametricKuen.cxx +++ b/Common/ComputationalGeometry/vtkParametricKuen.cxx @@ -19,6 +19,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricKuen); //----------------------------------------------------------------------------// vtkParametricKuen::vtkParametricKuen() @@ -122,3 +123,4 @@ void vtkParametricKuen::PrintSelf(ostream& os, vtkIndent indent) os << indent << "DeltaV0: " << this->DeltaV0 << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricKuen.h b/Common/ComputationalGeometry/vtkParametricKuen.h index 02f34c88fc..877bb9a718 100644 --- a/Common/ComputationalGeometry/vtkParametricKuen.h +++ b/Common/ComputationalGeometry/vtkParametricKuen.h @@ -31,6 +31,7 @@ #include "vtkMath.h" // for vtkMath::Pi() #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKuen : public vtkParametricFunction { public: @@ -92,4 +93,5 @@ private: double DeltaV0; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricMobius.cxx b/Common/ComputationalGeometry/vtkParametricMobius.cxx index d79ee90952..a035255344 100644 --- a/Common/ComputationalGeometry/vtkParametricMobius.cxx +++ b/Common/ComputationalGeometry/vtkParametricMobius.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricMobius); //------------------------------------------------------------------------------ @@ -80,3 +81,4 @@ void vtkParametricMobius::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Radius: " << this->Radius << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricMobius.h b/Common/ComputationalGeometry/vtkParametricMobius.h index 840baccfaf..bfb6eeb41b 100644 --- a/Common/ComputationalGeometry/vtkParametricMobius.h +++ b/Common/ComputationalGeometry/vtkParametricMobius.h @@ -34,6 +34,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricMobius : public vtkParametricFunction { public: @@ -102,4 +103,5 @@ private: void operator=(const vtkParametricMobius&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricPluckerConoid.cxx b/Common/ComputationalGeometry/vtkParametricPluckerConoid.cxx index 0a31e4272f..2ca3124a11 100644 --- a/Common/ComputationalGeometry/vtkParametricPluckerConoid.cxx +++ b/Common/ComputationalGeometry/vtkParametricPluckerConoid.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricPluckerConoid); //----------------------------------------------------------------------------// vtkParametricPluckerConoid::vtkParametricPluckerConoid() @@ -78,3 +79,4 @@ void vtkParametricPluckerConoid::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricPluckerConoid.h b/Common/ComputationalGeometry/vtkParametricPluckerConoid.h index 875c0f2f0b..b60deb50c1 100644 --- a/Common/ComputationalGeometry/vtkParametricPluckerConoid.h +++ b/Common/ComputationalGeometry/vtkParametricPluckerConoid.h @@ -34,6 +34,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricPluckerConoid : public vtkParametricFunction { @@ -93,4 +94,5 @@ private: void operator=(const vtkParametricPluckerConoid&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricPseudosphere.cxx b/Common/ComputationalGeometry/vtkParametricPseudosphere.cxx index 4c8f71464c..4c9035e19f 100644 --- a/Common/ComputationalGeometry/vtkParametricPseudosphere.cxx +++ b/Common/ComputationalGeometry/vtkParametricPseudosphere.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricPseudosphere); //----------------------------------------------------------------------------// vtkParametricPseudosphere::vtkParametricPseudosphere() @@ -84,3 +85,4 @@ void vtkParametricPseudosphere::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricPseudosphere.h b/Common/ComputationalGeometry/vtkParametricPseudosphere.h index aab66afde3..ba5b2094db 100644 --- a/Common/ComputationalGeometry/vtkParametricPseudosphere.h +++ b/Common/ComputationalGeometry/vtkParametricPseudosphere.h @@ -31,6 +31,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricPseudosphere : public vtkParametricFunction { public: @@ -78,4 +79,5 @@ private: void operator=(const vtkParametricPseudosphere&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricRandomHills.cxx b/Common/ComputationalGeometry/vtkParametricRandomHills.cxx index b6948ed08f..325c4e65fa 100644 --- a/Common/ComputationalGeometry/vtkParametricRandomHills.cxx +++ b/Common/ComputationalGeometry/vtkParametricRandomHills.cxx @@ -20,6 +20,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricRandomHills); //------------------------------------------------------------------------------ @@ -271,3 +272,4 @@ void vtkParametricRandomHills::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Random number generator seed: " << this->RandomSeed << "\n"; os << indent << "Allow random generation: " << this->AllowRandomGeneration << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricRandomHills.h b/Common/ComputationalGeometry/vtkParametricRandomHills.h index 1942ae32da..103cafa9dd 100644 --- a/Common/ComputationalGeometry/vtkParametricRandomHills.h +++ b/Common/ComputationalGeometry/vtkParametricRandomHills.h @@ -38,6 +38,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkMinimalStandardRandomSequence; @@ -260,4 +261,5 @@ private: ///@} }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricRoman.cxx b/Common/ComputationalGeometry/vtkParametricRoman.cxx index db10d47548..db95f84c43 100644 --- a/Common/ComputationalGeometry/vtkParametricRoman.cxx +++ b/Common/ComputationalGeometry/vtkParametricRoman.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricRoman); //------------------------------------------------------------------------------ @@ -85,3 +86,4 @@ void vtkParametricRoman::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Radius: " << this->Radius << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricRoman.h b/Common/ComputationalGeometry/vtkParametricRoman.h index 4f74bb27de..f91156995f 100644 --- a/Common/ComputationalGeometry/vtkParametricRoman.h +++ b/Common/ComputationalGeometry/vtkParametricRoman.h @@ -34,6 +34,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricRoman : public vtkParametricFunction { @@ -103,4 +104,5 @@ private: void operator=(const vtkParametricRoman&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricSpline.cxx b/Common/ComputationalGeometry/vtkParametricSpline.cxx index 79615fa3bb..dd750a5cd6 100644 --- a/Common/ComputationalGeometry/vtkParametricSpline.cxx +++ b/Common/ComputationalGeometry/vtkParametricSpline.cxx @@ -18,6 +18,7 @@ #include "vtkObjectFactory.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricSpline); //------------------------------------------------------------------------------ @@ -405,3 +406,4 @@ void vtkParametricSpline::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Right Value: " << this->RightValue << "\n"; os << indent << "Parameterize by length: " << (this->ParameterizeByLength ? "On\n" : "Off\n"); } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricSpline.h b/Common/ComputationalGeometry/vtkParametricSpline.h index 400c741d70..ac71fdf5a8 100644 --- a/Common/ComputationalGeometry/vtkParametricSpline.h +++ b/Common/ComputationalGeometry/vtkParametricSpline.h @@ -38,12 +38,13 @@ #ifndef vtkParametricSpline_h #define vtkParametricSpline_h -class vtkSpline; -class vtkPoints; - #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN +class vtkSpline; +class vtkPoints; + class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricSpline : public vtkParametricFunction { public: @@ -197,4 +198,5 @@ private: void operator=(const vtkParametricSpline&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx index 889051ce3f..5bdbd20577 100644 --- a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx +++ b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx @@ -17,6 +17,7 @@ #include "vtkObjectFactory.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricSuperEllipsoid); namespace @@ -112,3 +113,4 @@ void vtkParametricSuperEllipsoid::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Squareness in the z-axis: " << this->N1 << "\n"; os << indent << "Squareness in the x-y plane: " << this->N2 << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h index e138f326bc..a2386c683f 100644 --- a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h +++ b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h @@ -43,6 +43,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricSuperEllipsoid : public vtkParametricFunction { @@ -149,4 +150,5 @@ private: void operator=(const vtkParametricSuperEllipsoid&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx b/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx index 6dbf8b671f..03abb596b4 100644 --- a/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx +++ b/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx @@ -17,6 +17,7 @@ #include "vtkObjectFactory.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricSuperToroid); namespace @@ -112,3 +113,4 @@ void vtkParametricSuperToroid::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Y scale factor: " << this->YRadius << "\n"; os << indent << "Z scale factor: " << this->ZRadius << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricSuperToroid.h b/Common/ComputationalGeometry/vtkParametricSuperToroid.h index 7dd499c820..f8b796f32c 100644 --- a/Common/ComputationalGeometry/vtkParametricSuperToroid.h +++ b/Common/ComputationalGeometry/vtkParametricSuperToroid.h @@ -47,6 +47,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricSuperToroid : public vtkParametricFunction { public: @@ -173,4 +174,5 @@ private: void operator=(const vtkParametricSuperToroid&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/ComputationalGeometry/vtkParametricTorus.cxx b/Common/ComputationalGeometry/vtkParametricTorus.cxx index 286137f050..65f30f6bef 100644 --- a/Common/ComputationalGeometry/vtkParametricTorus.cxx +++ b/Common/ComputationalGeometry/vtkParametricTorus.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkParametricTorus); //------------------------------------------------------------------------------ @@ -84,3 +85,4 @@ void vtkParametricTorus::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Ring Radius: " << this->RingRadius << "\n"; os << indent << "Cross-Sectional Radius: " << this->CrossSectionRadius << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/ComputationalGeometry/vtkParametricTorus.h b/Common/ComputationalGeometry/vtkParametricTorus.h index ca61b1d505..7a2853ba54 100644 --- a/Common/ComputationalGeometry/vtkParametricTorus.h +++ b/Common/ComputationalGeometry/vtkParametricTorus.h @@ -34,6 +34,7 @@ #include "vtkCommonComputationalGeometryModule.h" // For export macro #include "vtkParametricFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricTorus : public vtkParametricFunction { @@ -113,4 +114,5 @@ private: void operator=(const vtkParametricTorus&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h b/Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h index e63ab157f8..de3b3eb388 100644 --- a/Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h +++ b/Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h @@ -44,6 +44,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPThreadLocalAPI @@ -214,6 +215,7 @@ private: } }; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/Common/vtkSMPThreadLocalImplAbstract.h b/Common/Core/SMP/Common/vtkSMPThreadLocalImplAbstract.h index 34b01b6c38..c2699953e0 100644 --- a/Common/Core/SMP/Common/vtkSMPThreadLocalImplAbstract.h +++ b/Common/Core/SMP/Common/vtkSMPThreadLocalImplAbstract.h @@ -26,6 +26,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPThreadLocalImplAbstract @@ -71,6 +72,7 @@ class vtkSMPThreadLocalImpl : public vtkSMPThreadLocalImplAbstract { }; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/Common/vtkSMPToolsAPI.cxx b/Common/Core/SMP/Common/vtkSMPToolsAPI.cxx index 241f35cac7..ba160572bf 100644 --- a/Common/Core/SMP/Common/vtkSMPToolsAPI.cxx +++ b/Common/Core/SMP/Common/vtkSMPToolsAPI.cxx @@ -28,6 +28,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkSMPToolsAPI::vtkSMPToolsAPI() @@ -246,6 +247,7 @@ bool vtkSMPToolsAPI::GetSingleThread() } } +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/Common/vtkSMPToolsAPI.h b/Common/Core/SMP/Common/vtkSMPToolsAPI.h index 392354ad8e..e47c074fe1 100644 --- a/Common/Core/SMP/Common/vtkSMPToolsAPI.h +++ b/Common/Core/SMP/Common/vtkSMPToolsAPI.h @@ -43,6 +43,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN using vtkSMPToolsDefaultImpl = vtkSMPToolsImpl; @@ -297,6 +298,7 @@ private: #endif }; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/Common/vtkSMPToolsImpl.h b/Common/Core/SMP/Common/vtkSMPToolsImpl.h index aef3d861f9..5e799459f7 100644 --- a/Common/Core/SMP/Common/vtkSMPToolsImpl.h +++ b/Common/Core/SMP/Common/vtkSMPToolsImpl.h @@ -35,7 +35,7 @@ namespace detail { namespace smp { - +VTK_ABI_NAMESPACE_BEGIN enum class BackendType { Sequential = VTK_SMP_BACKEND_SEQUENTIAL, @@ -111,6 +111,7 @@ private: using ExecuteFunctorPtrType = void (*)(void*, vtkIdType, vtkIdType, vtkIdType); +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/Common/vtkSMPToolsInternal.h b/Common/Core/SMP/Common/vtkSMPToolsInternal.h index 6bdd082600..1ed76064e3 100644 --- a/Common/Core/SMP/Common/vtkSMPToolsInternal.h +++ b/Common/Core/SMP/Common/vtkSMPToolsInternal.h @@ -25,6 +25,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN template class UnaryTransformCall @@ -101,6 +102,8 @@ public: T operator()(T vtkNotUsed(inValue)) { return Value; } }; +VTK_ABI_NAMESPACE_END + } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/OpenMP/vtkSMPThreadLocalBackend.cxx b/Common/Core/SMP/OpenMP/vtkSMPThreadLocalBackend.cxx index c626383042..2c46be094c 100644 --- a/Common/Core/SMP/OpenMP/vtkSMPThreadLocalBackend.cxx +++ b/Common/Core/SMP/OpenMP/vtkSMPThreadLocalBackend.cxx @@ -28,6 +28,7 @@ namespace smp { namespace OpenMP { +VTK_ABI_NAMESPACE_BEGIN static ThreadIdType GetThreadId() { @@ -261,7 +262,7 @@ StoragePointerType& ThreadSpecific::GetStorage() } return slot->Storage; } - +VTK_ABI_NAMESPACE_END } // OpenMP } // namespace smp } // namespace detail diff --git a/Common/Core/SMP/OpenMP/vtkSMPThreadLocalBackend.h b/Common/Core/SMP/OpenMP/vtkSMPThreadLocalBackend.h index 5f3ed97d2c..e670f40e08 100644 --- a/Common/Core/SMP/OpenMP/vtkSMPThreadLocalBackend.h +++ b/Common/Core/SMP/OpenMP/vtkSMPThreadLocalBackend.h @@ -46,6 +46,7 @@ namespace smp { namespace OpenMP { +VTK_ABI_NAMESPACE_BEGIN typedef void* ThreadIdType; typedef vtkTypeUInt32 HashType; @@ -177,6 +178,7 @@ private: size_t CurrentSlot; }; +VTK_ABI_NAMESPACE_END } // OpenMP; } // namespace smp } // namespace detail diff --git a/Common/Core/SMP/OpenMP/vtkSMPThreadLocalImpl.h b/Common/Core/SMP/OpenMP/vtkSMPThreadLocalImpl.h index 23bc2e9123..6839ee2e93 100644 --- a/Common/Core/SMP/OpenMP/vtkSMPThreadLocalImpl.h +++ b/Common/Core/SMP/OpenMP/vtkSMPThreadLocalImpl.h @@ -31,6 +31,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPThreadLocalImpl : public vtkSMPThreadLocalImplAbstract @@ -126,6 +127,7 @@ private: void operator=(const vtkSMPThreadLocalImpl&) = delete; }; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/OpenMP/vtkSMPToolsImpl.cxx b/Common/Core/SMP/OpenMP/vtkSMPToolsImpl.cxx index 90fb7700a3..13f9f17074 100644 --- a/Common/Core/SMP/OpenMP/vtkSMPToolsImpl.cxx +++ b/Common/Core/SMP/OpenMP/vtkSMPToolsImpl.cxx @@ -26,6 +26,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN static int specifiedNumThreads = 0; static std::stack threadIdStack; @@ -107,6 +108,7 @@ void vtkSMPToolsImplForOpenMP(vtkIdType first, vtkIdType last, vtkIdType grain, threadIdStack.pop(); } +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/OpenMP/vtkSMPToolsImpl.txx b/Common/Core/SMP/OpenMP/vtkSMPToolsImpl.txx index 2270c6f27f..62624ecb75 100644 --- a/Common/Core/SMP/OpenMP/vtkSMPToolsImpl.txx +++ b/Common/Core/SMP/OpenMP/vtkSMPToolsImpl.txx @@ -28,6 +28,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN int VTKCOMMONCORE_EXPORT GetNumberOfThreadsOpenMP(); bool VTKCOMMONCORE_EXPORT GetSingleThreadOpenMP(); @@ -150,6 +151,7 @@ int vtkSMPToolsImpl::GetEstimatedNumberOfThreads(); template <> bool vtkSMPToolsImpl::GetSingleThread(); +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/STDThread/vtkSMPThreadLocalBackend.cxx b/Common/Core/SMP/STDThread/vtkSMPThreadLocalBackend.cxx index e74ca8b765..60eaac541c 100644 --- a/Common/Core/SMP/STDThread/vtkSMPThreadLocalBackend.cxx +++ b/Common/Core/SMP/STDThread/vtkSMPThreadLocalBackend.cxx @@ -28,6 +28,7 @@ namespace smp { namespace STDThread { +VTK_ABI_NAMESPACE_BEGIN static ThreadIdType GetThreadId() { @@ -216,6 +217,7 @@ size_t ThreadSpecific::GetSize() const return this->Size; } +VTK_ABI_NAMESPACE_END } // STDThread } // namespace smp } // namespace detail diff --git a/Common/Core/SMP/STDThread/vtkSMPThreadLocalBackend.h b/Common/Core/SMP/STDThread/vtkSMPThreadLocalBackend.h index 7f5e946344..09088d660b 100644 --- a/Common/Core/SMP/STDThread/vtkSMPThreadLocalBackend.h +++ b/Common/Core/SMP/STDThread/vtkSMPThreadLocalBackend.h @@ -51,6 +51,7 @@ namespace smp { namespace STDThread { +VTK_ABI_NAMESPACE_BEGIN typedef size_t ThreadIdType; typedef uint_fast32_t HashType; @@ -178,6 +179,7 @@ private: size_t CurrentSlot; }; +VTK_ABI_NAMESPACE_END } // STDThread; } // namespace smp } // namespace detail diff --git a/Common/Core/SMP/STDThread/vtkSMPThreadLocalImpl.h b/Common/Core/SMP/STDThread/vtkSMPThreadLocalImpl.h index a3bb9f3502..51af834623 100644 --- a/Common/Core/SMP/STDThread/vtkSMPThreadLocalImpl.h +++ b/Common/Core/SMP/STDThread/vtkSMPThreadLocalImpl.h @@ -31,6 +31,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPThreadLocalImpl : public vtkSMPThreadLocalImplAbstract @@ -126,6 +127,7 @@ private: void operator=(const vtkSMPThreadLocalImpl&) = delete; }; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/STDThread/vtkSMPThreadPool.cxx b/Common/Core/SMP/STDThread/vtkSMPThreadPool.cxx index 69f6ba6f09..08ac09170d 100644 --- a/Common/Core/SMP/STDThread/vtkSMPThreadPool.cxx +++ b/Common/Core/SMP/STDThread/vtkSMPThreadPool.cxx @@ -17,7 +17,15 @@ #include -vtk::detail::smp::vtkSMPThreadPool::vtkSMPThreadPool(int threadNumber) +namespace vtk +{ +namespace detail +{ +namespace smp +{ +VTK_ABI_NAMESPACE_BEGIN + +vtkSMPThreadPool::vtkSMPThreadPool(int threadNumber) { this->Threads.reserve(threadNumber); for (int i = 0; i < threadNumber; ++i) @@ -26,7 +34,7 @@ vtk::detail::smp::vtkSMPThreadPool::vtkSMPThreadPool(int threadNumber) } } -void vtk::detail::smp::vtkSMPThreadPool::Join() +void vtkSMPThreadPool::Join() { { std::unique_lock lock(this->Mutex); @@ -41,7 +49,7 @@ void vtk::detail::smp::vtkSMPThreadPool::Join() } } -void vtk::detail::smp::vtkSMPThreadPool::DoJob(std::function job) +void vtkSMPThreadPool::DoJob(std::function job) { std::unique_lock lock(this->Mutex); @@ -49,7 +57,7 @@ void vtk::detail::smp::vtkSMPThreadPool::DoJob(std::function job) this->ConditionVariable.notify_one(); } -void vtk::detail::smp::vtkSMPThreadPool::ThreadJob() +void vtkSMPThreadPool::ThreadJob() { std::function job; @@ -77,3 +85,7 @@ std::vector* vtk::detail::smp::vtkSMPThreadPool::GetThreads() { return &(this->Threads); } +VTK_ABI_NAMESPACE_END +} // namespace smp +} // namespace detail +} // namespace vtk diff --git a/Common/Core/SMP/STDThread/vtkSMPThreadPool.h b/Common/Core/SMP/STDThread/vtkSMPThreadPool.h index 9097e15b2d..e64430876f 100644 --- a/Common/Core/SMP/STDThread/vtkSMPThreadPool.h +++ b/Common/Core/SMP/STDThread/vtkSMPThreadPool.h @@ -39,6 +39,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkSMPThreadPool { @@ -60,6 +61,7 @@ private: std::vector Threads; }; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/STDThread/vtkSMPToolsImpl.cxx b/Common/Core/SMP/STDThread/vtkSMPToolsImpl.cxx index bdaf7029c7..c6d1c3d4c3 100644 --- a/Common/Core/SMP/STDThread/vtkSMPToolsImpl.cxx +++ b/Common/Core/SMP/STDThread/vtkSMPToolsImpl.cxx @@ -26,6 +26,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN static int specifiedNumThreads = 0; static std::stack threadIdStack; static std::mutex threadIdStackLock; @@ -96,6 +97,7 @@ bool vtkSMPToolsImpl::GetSingleThread() return GetSingleThreadSTDThread(); } +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/STDThread/vtkSMPToolsImpl.txx b/Common/Core/SMP/STDThread/vtkSMPToolsImpl.txx index 8e680671d7..f25557441a 100644 --- a/Common/Core/SMP/STDThread/vtkSMPToolsImpl.txx +++ b/Common/Core/SMP/STDThread/vtkSMPToolsImpl.txx @@ -30,6 +30,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN int VTKCOMMONCORE_EXPORT GetNumberOfThreadsSTDThread(); bool VTKCOMMONCORE_EXPORT GetSingleThreadSTDThread(); @@ -168,6 +169,7 @@ int vtkSMPToolsImpl::GetEstimatedNumberOfThreads(); template <> bool vtkSMPToolsImpl::GetSingleThread(); +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/Sequential/vtkSMPThreadLocalImpl.h b/Common/Core/SMP/Sequential/vtkSMPThreadLocalImpl.h index 9e3cdacb63..9920f5fa23 100644 --- a/Common/Core/SMP/Sequential/vtkSMPThreadLocalImpl.h +++ b/Common/Core/SMP/Sequential/vtkSMPThreadLocalImpl.h @@ -34,6 +34,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPThreadLocalImpl : public vtkSMPThreadLocalImplAbstract @@ -170,6 +171,7 @@ private: void operator=(const vtkSMPThreadLocalImpl&) = delete; }; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/Sequential/vtkSMPToolsImpl.cxx b/Common/Core/SMP/Sequential/vtkSMPToolsImpl.cxx index 338a64c968..2e6fc5d7a8 100644 --- a/Common/Core/SMP/Sequential/vtkSMPToolsImpl.cxx +++ b/Common/Core/SMP/Sequential/vtkSMPToolsImpl.cxx @@ -22,6 +22,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ template <> @@ -43,6 +44,7 @@ bool vtkSMPToolsImpl::GetSingleThread() return true; } +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/Sequential/vtkSMPToolsImpl.txx b/Common/Core/SMP/Sequential/vtkSMPToolsImpl.txx index 247d897655..1dd8088c69 100644 --- a/Common/Core/SMP/Sequential/vtkSMPToolsImpl.txx +++ b/Common/Core/SMP/Sequential/vtkSMPToolsImpl.txx @@ -27,6 +27,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN //-------------------------------------------------------------------------------- template <> @@ -116,6 +117,7 @@ int vtkSMPToolsImpl::GetEstimatedNumberOfThreads(); template <> bool vtkSMPToolsImpl::GetSingleThread(); +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/TBB/vtkSMPThreadLocalImpl.h b/Common/Core/SMP/TBB/vtkSMPThreadLocalImpl.h index b7a787def9..b3053f9e21 100644 --- a/Common/Core/SMP/TBB/vtkSMPThreadLocalImpl.h +++ b/Common/Core/SMP/TBB/vtkSMPThreadLocalImpl.h @@ -39,6 +39,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPThreadLocalImpl : public vtkSMPThreadLocalImplAbstract @@ -110,6 +111,7 @@ private: void operator=(const vtkSMPThreadLocalImpl&) = delete; }; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/TBB/vtkSMPToolsImpl.cxx b/Common/Core/SMP/TBB/vtkSMPToolsImpl.cxx index fb0a7d119a..6bd7e62ac0 100644 --- a/Common/Core/SMP/TBB/vtkSMPToolsImpl.cxx +++ b/Common/Core/SMP/TBB/vtkSMPToolsImpl.cxx @@ -37,6 +37,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN static tbb::task_arena taskArena; static std::mutex vtkSMPToolsCS; @@ -114,6 +115,7 @@ void vtkSMPToolsImplForTBB(vtkIdType first, vtkIdType last, vtkIdType grain, threadIdStackLock.unlock(); } +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/SMP/TBB/vtkSMPToolsImpl.txx b/Common/Core/SMP/TBB/vtkSMPToolsImpl.txx index dc51a6ab5a..a01f7da3d6 100644 --- a/Common/Core/SMP/TBB/vtkSMPToolsImpl.txx +++ b/Common/Core/SMP/TBB/vtkSMPToolsImpl.txx @@ -39,6 +39,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN void VTKCOMMONCORE_EXPORT vtkSMPToolsImplForTBB(vtkIdType first, vtkIdType last, vtkIdType grain, ExecuteFunctorPtrType functorExecuter, void* functor); @@ -201,6 +202,7 @@ int vtkSMPToolsImpl::GetEstimatedNumberOfThreads(); template <> bool vtkSMPToolsImpl::GetSingleThread(); +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk diff --git a/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx index f757166086..7a677338e5 100644 --- a/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx +++ b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx @@ -53,6 +53,8 @@ public: std::string Value; }; +VTK_ABI_NAMESPACE_BEGIN + template <> inline UserType vtkVariantCast(const vtkVariant& value, bool* valid) { @@ -66,6 +68,7 @@ inline vtkVariant vtkVariantCreate(const UserType& value) { return vtkVariant(value.Value); } +VTK_ABI_NAMESPACE_END int TestArrayUserTypes(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) { diff --git a/Common/Core/Testing/Cxx/vtkTestNewVar.h b/Common/Core/Testing/Cxx/vtkTestNewVar.h index 8d55b29364..83b8862a03 100644 --- a/Common/Core/Testing/Cxx/vtkTestNewVar.h +++ b/Common/Core/Testing/Cxx/vtkTestNewVar.h @@ -23,7 +23,9 @@ #include "vtkNew.h" #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPoints2D; +VTK_ABI_NAMESPACE_END class vtkTestNewVar : public vtkObject { diff --git a/Common/Core/vtkABI.h b/Common/Core/vtkABI.h index 107727128a..6ae1f84f21 100644 --- a/Common/Core/vtkABI.h +++ b/Common/Core/vtkABI.h @@ -58,6 +58,8 @@ #define VTK_ABI_HIDDEN #endif +#include "vtkABINamespace.h" + /*--------------------------------------------------------------------------*/ /* If not already defined, define vtkTypeBool. When VTK was started, some */ /* compilers did not yet support the bool type, and so VTK often used int, */ diff --git a/Common/Core/vtkAOSDataArrayTemplate.h b/Common/Core/vtkAOSDataArrayTemplate.h index effa4ad109..0bddf4e119 100644 --- a/Common/Core/vtkAOSDataArrayTemplate.h +++ b/Common/Core/vtkAOSDataArrayTemplate.h @@ -39,6 +39,7 @@ // The export macro below makes no sense, but is necessary for older compilers // when we export instantiations of this class from vtkCommonCore. +VTK_ABI_NAMESPACE_BEGIN template class VTKCOMMONCORE_EXPORT vtkAOSDataArrayTemplate : public vtkGenericDataArray, ValueTypeT> @@ -298,6 +299,8 @@ private: // Declare vtkArrayDownCast implementations for AoS containers: vtkArrayDownCast_TemplateFastCastMacro(vtkAOSDataArrayTemplate); +VTK_ABI_NAMESPACE_END + // This macro is used by the subclasses to create dummy // declarations for these functions such that the wrapper // can see them. The wrappers ignore vtkAOSDataArrayTemplate. @@ -329,9 +332,13 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkAOSDataArrayTemplate); #define VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(T) \ namespace vtkDataArrayPrivate \ { \ + VTK_ABI_NAMESPACE_BEGIN \ VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(vtkAOSDataArrayTemplate, double); \ + VTK_ABI_NAMESPACE_END \ } \ - template class VTKCOMMONCORE_EXPORT vtkAOSDataArrayTemplate + VTK_ABI_NAMESPACE_BEGIN \ + template class VTKCOMMONCORE_EXPORT vtkAOSDataArrayTemplate; \ + VTK_ABI_NAMESPACE_END #elif defined(VTK_USE_EXTERN_TEMPLATE) #ifndef VTK_AOS_DATA_ARRAY_TEMPLATE_EXTERN @@ -342,7 +349,9 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkAOSDataArrayTemplate); // dllexport and is used from another class in vtkCommonCore #pragma warning(disable : 4910) // extern and dllexport incompatible #endif +VTK_ABI_NAMESPACE_BEGIN vtkExternTemplateMacro(extern template class VTKCOMMONCORE_EXPORT vtkAOSDataArrayTemplate); +VTK_ABI_NAMESPACE_END #ifdef _MSC_VER #pragma warning(pop) #endif @@ -373,7 +382,9 @@ vtkExternTemplateMacro(extern template class VTKCOMMONCORE_EXPORT vtkAOSDataArra // Use an "extern explicit instantiation" to give the class a DLL // interface. This is a compiler-specific extension. +VTK_ABI_NAMESPACE_BEGIN vtkInstantiateTemplateMacro(extern template class VTKCOMMONCORE_EXPORT vtkAOSDataArrayTemplate); +VTK_ABI_NAMESPACE_END #pragma warning(pop) diff --git a/Common/Core/vtkAOSDataArrayTemplate.txx b/Common/Core/vtkAOSDataArrayTemplate.txx index af9c529719..781d1862a6 100644 --- a/Common/Core/vtkAOSDataArrayTemplate.txx +++ b/Common/Core/vtkAOSDataArrayTemplate.txx @@ -26,6 +26,7 @@ #include "vtkArrayIteratorTemplate.h" //----------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN template vtkAOSDataArrayTemplate* vtkAOSDataArrayTemplate::New() { @@ -469,4 +470,5 @@ bool vtkAOSDataArrayTemplate::ReallocateTuples(vtkIdType numTuples) return false; } +VTK_ABI_NAMESPACE_END #endif // header guard diff --git a/Common/Core/vtkAbstractArray.cxx b/Common/Core/vtkAbstractArray.cxx index 33157ee9aa..b18e9b676e 100644 --- a/Common/Core/vtkAbstractArray.cxx +++ b/Common/Core/vtkAbstractArray.cxx @@ -58,17 +58,21 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkInformationKeyMacro(vtkAbstractArray, GUI_HIDE, Integer); vtkInformationKeyMacro(vtkAbstractArray, PER_COMPONENT, InformationVector); vtkInformationKeyMacro(vtkAbstractArray, PER_FINITE_COMPONENT, InformationVector); vtkInformationKeyMacro(vtkAbstractArray, DISCRETE_VALUES, VariantVector); vtkInformationKeyRestrictedMacro( vtkAbstractArray, DISCRETE_VALUE_SAMPLE_PARAMETERS, DoubleVector, 2); +VTK_ABI_NAMESPACE_END namespace { typedef std::vector vtkInternalComponentNameBase; } + +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractArray::vtkInternalComponentNames : public vtkInternalComponentNameBase { }; @@ -623,6 +627,7 @@ void vtkAbstractArray::GetProminentComponentValues( } } } +VTK_ABI_NAMESPACE_END //------------------------------------------------------------------------------ namespace @@ -758,6 +763,7 @@ void SampleProminentValues(std::vector>& uniques, vtkIdT } } // End anonymous namespace. +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ void vtkAbstractArray::UpdateDiscreteValueSet(double uncertainty, double minimumProminence) { @@ -869,3 +875,4 @@ void vtkAbstractArray::UpdateDiscreteValueSet(double uncertainty, double minimum params[1] = minimumProminence; this->GetInformation()->Set(DISCRETE_VALUE_SAMPLE_PARAMETERS(), params, 2); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkAbstractArray.h b/Common/Core/vtkAbstractArray.h index 288be53b32..3ceb6f65bb 100644 --- a/Common/Core/vtkAbstractArray.h +++ b/Common/Core/vtkAbstractArray.h @@ -69,6 +69,7 @@ #include "vtkObject.h" #include "vtkVariant.h" // for variant arguments +VTK_ABI_NAMESPACE_BEGIN class vtkArrayIterator; class vtkDataArray; class vtkIdList; @@ -758,6 +759,8 @@ ArrayT* vtkArrayDownCast(vtkAbstractArray* array) return vtkArrayDownCast_impl()(array); } +VTK_ABI_NAMESPACE_END + ///@{ /** * This macro is used to tell vtkArrayDownCast to use FastDownCast instead of @@ -788,5 +791,4 @@ ArrayT* vtkArrayDownCast(vtkAbstractArray* array) } \ } ///@} - #endif diff --git a/Common/Core/vtkAndroidOutputWindow.cxx b/Common/Core/vtkAndroidOutputWindow.cxx index 2dc4e17a10..aa2e96db63 100644 --- a/Common/Core/vtkAndroidOutputWindow.cxx +++ b/Common/Core/vtkAndroidOutputWindow.cxx @@ -20,6 +20,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAndroidOutputWindow); //------------------------------------------------------------------------------ @@ -115,3 +116,4 @@ void vtkAndroidOutputWindow::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkAndroidOutputWindow.h b/Common/Core/vtkAndroidOutputWindow.h index 375a0b8215..f4df29835b 100644 --- a/Common/Core/vtkAndroidOutputWindow.h +++ b/Common/Core/vtkAndroidOutputWindow.h @@ -31,6 +31,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkOutputWindow.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkAndroidOutputWindow : public vtkOutputWindow { public: @@ -64,4 +65,5 @@ private: void operator=(const vtkAndroidOutputWindow&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkAnimationCue.cxx b/Common/Core/vtkAnimationCue.cxx index 9ea7cfe530..2d25972a7c 100644 --- a/Common/Core/vtkAnimationCue.cxx +++ b/Common/Core/vtkAnimationCue.cxx @@ -17,6 +17,7 @@ #include "vtkCommand.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAnimationCue); //------------------------------------------------------------------------------ @@ -167,3 +168,4 @@ void vtkAnimationCue::PrintSelf(ostream& os, vtkIndent indent) << "Direction: " << (this->Direction == PlayDirection::BACKWARD ? "Backward" : "Forward") << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkAnimationCue.h b/Common/Core/vtkAnimationCue.h index 68ac593af4..d1d39a9f79 100644 --- a/Common/Core/vtkAnimationCue.h +++ b/Common/Core/vtkAnimationCue.h @@ -41,6 +41,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkAnimationCue : public vtkObject { public: @@ -242,4 +243,5 @@ private: void operator=(const vtkAnimationCue&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkArchiver.cxx b/Common/Core/vtkArchiver.cxx index c8f8b85b44..4df1ecb22d 100644 --- a/Common/Core/vtkArchiver.cxx +++ b/Common/Core/vtkArchiver.cxx @@ -22,6 +22,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkArchiver); //------------------------------------------------------------------------------ @@ -83,3 +84,4 @@ void vtkArchiver::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArchiver.h b/Common/Core/vtkArchiver.h index ea72598c99..1e702de7ae 100644 --- a/Common/Core/vtkArchiver.h +++ b/Common/Core/vtkArchiver.h @@ -33,6 +33,7 @@ #include // For std::streamsize +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkArchiver : public vtkObject { public: @@ -88,4 +89,5 @@ private: void operator=(const vtkArchiver&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkArray.cxx b/Common/Core/vtkArray.cxx index 813736a474..bc30e249a9 100644 --- a/Common/Core/vtkArray.cxx +++ b/Common/Core/vtkArray.cxx @@ -32,6 +32,7 @@ //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkArray::vtkArray() = default; //------------------------------------------------------------------------------ @@ -246,3 +247,4 @@ vtkStdString vtkArray::GetDimensionLabel(DimensionT i) return this->InternalGetDimensionLabel(i); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArray.h b/Common/Core/vtkArray.h index ea82efe5ec..a71fa75650 100644 --- a/Common/Core/vtkArray.h +++ b/Common/Core/vtkArray.h @@ -61,6 +61,7 @@ #include "vtkStdString.h" // for vtkStdString #include "vtkVariant.h" // for vtkVariant +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkArray : public vtkObject { public: @@ -303,4 +304,5 @@ void vtkArray::SetVariantValue(CoordinateT i, CoordinateT j, CoordinateT k, cons this->SetVariantValue(vtkArrayCoordinates(i, j, k), value); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkArrayCoordinates.cxx b/Common/Core/vtkArrayCoordinates.cxx index fb71ab4811..68448b549a 100644 --- a/Common/Core/vtkArrayCoordinates.cxx +++ b/Common/Core/vtkArrayCoordinates.cxx @@ -21,6 +21,7 @@ #include "vtkArrayCoordinates.h" +VTK_ABI_NAMESPACE_BEGIN vtkArrayCoordinates::vtkArrayCoordinates() = default; vtkArrayCoordinates::vtkArrayCoordinates(CoordinateT i) @@ -95,3 +96,4 @@ ostream& operator<<(ostream& stream, const vtkArrayCoordinates& rhs) return stream; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArrayCoordinates.h b/Common/Core/vtkArrayCoordinates.h index 2a02e1588a..49a5bdb1b7 100644 --- a/Common/Core/vtkArrayCoordinates.h +++ b/Common/Core/vtkArrayCoordinates.h @@ -48,6 +48,7 @@ #include "vtkSystemIncludes.h" #include +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkArrayCoordinates { public: @@ -124,6 +125,7 @@ private: std::vector Storage; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkArrayCoordinates.h diff --git a/Common/Core/vtkArrayDispatch.h b/Common/Core/vtkArrayDispatch.h index 4e532addd6..3c0cc6c890 100644 --- a/Common/Core/vtkArrayDispatch.h +++ b/Common/Core/vtkArrayDispatch.h @@ -201,6 +201,7 @@ namespace vtkArrayDispatch { +VTK_ABI_NAMESPACE_BEGIN /** * A TypeList containing all real ValueTypes. @@ -415,6 +416,7 @@ struct Dispatch3BySameValueType; template struct FilterArraysByValueType; +VTK_ABI_NAMESPACE_END } // end namespace vtkArrayDispatch #include "vtkArrayDispatch.txx" diff --git a/Common/Core/vtkArrayDispatch.txx b/Common/Core/vtkArrayDispatch.txx index 76556c4172..4e3ad9219c 100644 --- a/Common/Core/vtkArrayDispatch.txx +++ b/Common/Core/vtkArrayDispatch.txx @@ -23,12 +23,15 @@ #include // For std::forward +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; +VTK_ABI_NAMESPACE_END namespace vtkArrayDispatch { namespace impl { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // Implementation of the single-array dispatch mechanism. @@ -390,8 +393,10 @@ public: } }; +VTK_ABI_NAMESPACE_END } // end namespace impl +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // FilterArraysByValueType implementation: //------------------------------------------------------------------------------ @@ -764,6 +769,7 @@ public: } }; +VTK_ABI_NAMESPACE_END } // end namespace vtkArrayDispatch #endif // vtkArrayDispatch_txx diff --git a/Common/Core/vtkArrayExtents.cxx b/Common/Core/vtkArrayExtents.cxx index 375e4419d2..e285e79750 100644 --- a/Common/Core/vtkArrayExtents.cxx +++ b/Common/Core/vtkArrayExtents.cxx @@ -25,6 +25,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkArrayExtents::vtkArrayExtents() = default; vtkArrayExtents::vtkArrayExtents(const CoordinateT i) @@ -231,3 +232,4 @@ ostream& operator<<(ostream& stream, const vtkArrayExtents& rhs) return stream; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArrayExtents.h b/Common/Core/vtkArrayExtents.h index 2743cd071a..c9ec861a79 100644 --- a/Common/Core/vtkArrayExtents.h +++ b/Common/Core/vtkArrayExtents.h @@ -65,6 +65,7 @@ #include "vtkSystemIncludes.h" #include // STL Header +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkArrayExtents { public: @@ -231,5 +232,6 @@ private: std::vector Storage; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkArrayExtents.h diff --git a/Common/Core/vtkArrayExtentsList.cxx b/Common/Core/vtkArrayExtentsList.cxx index d7aeeea51e..f32613b1e9 100644 --- a/Common/Core/vtkArrayExtentsList.cxx +++ b/Common/Core/vtkArrayExtentsList.cxx @@ -21,6 +21,7 @@ #include "vtkArrayExtentsList.h" +VTK_ABI_NAMESPACE_BEGIN vtkArrayExtentsList::vtkArrayExtentsList() = default; vtkArrayExtentsList::vtkArrayExtentsList(const vtkArrayExtents& i) @@ -74,3 +75,4 @@ const vtkArrayExtents& vtkArrayExtentsList::operator[](vtkIdType i) const { return this->Storage[i]; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArrayExtentsList.h b/Common/Core/vtkArrayExtentsList.h index 37fcd84cb7..fbe68d6894 100644 --- a/Common/Core/vtkArrayExtentsList.h +++ b/Common/Core/vtkArrayExtentsList.h @@ -48,6 +48,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include // STL Header +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkArrayExtentsList { public: @@ -103,6 +104,7 @@ private: std::vector Storage; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkArrayExtentsList.h diff --git a/Common/Core/vtkArrayInterpolate.h b/Common/Core/vtkArrayInterpolate.h index 97fcc546ed..b0a0217875 100644 --- a/Common/Core/vtkArrayInterpolate.h +++ b/Common/Core/vtkArrayInterpolate.h @@ -46,6 +46,7 @@ #include "vtkTypedArray.h" +VTK_ABI_NAMESPACE_BEGIN class vtkArrayExtents; class vtkArraySlices; class vtkArrayWeights; @@ -57,6 +58,7 @@ void vtkInterpolate(vtkTypedArray* source_array, const vtkArraySlices& source const vtkArrayWeights& source_weights, const vtkArrayExtents& target_slice, vtkTypedArray* target_array); +VTK_ABI_NAMESPACE_END #include "vtkArrayInterpolate.txx" #endif diff --git a/Common/Core/vtkArrayInterpolate.txx b/Common/Core/vtkArrayInterpolate.txx index b58bb340e0..f1b697d0f2 100644 --- a/Common/Core/vtkArrayInterpolate.txx +++ b/Common/Core/vtkArrayInterpolate.txx @@ -25,6 +25,7 @@ #include "vtkArrayExtentsList.h" #include "vtkArrayWeights.h" +VTK_ABI_NAMESPACE_BEGIN template void vtkInterpolate(vtkTypedArray* source_array, const vtkArrayExtentsList& source_slices, const vtkArrayWeights& source_weights, const vtkArrayExtents& target_slice, @@ -77,4 +78,5 @@ void vtkInterpolate(vtkTypedArray* source_array, const vtkArrayExtentsList& s } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkArrayIterator.cxx b/Common/Core/vtkArrayIterator.cxx index 389e649a79..448cee15f9 100644 --- a/Common/Core/vtkArrayIterator.cxx +++ b/Common/Core/vtkArrayIterator.cxx @@ -17,6 +17,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkArrayIterator::vtkArrayIterator() = default; //------------------------------------------------------------------------------ @@ -27,3 +28,4 @@ void vtkArrayIterator::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArrayIterator.h b/Common/Core/vtkArrayIterator.h index 42d4521fa4..86a660eaa5 100644 --- a/Common/Core/vtkArrayIterator.h +++ b/Common/Core/vtkArrayIterator.h @@ -45,6 +45,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractArray; class VTKCOMMONCORE_EXPORT vtkArrayIterator : public vtkObject { @@ -76,4 +77,5 @@ private: void operator=(const vtkArrayIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkArrayIteratorTemplate.h b/Common/Core/vtkArrayIteratorTemplate.h index bce53d0442..4f6df0c02f 100644 --- a/Common/Core/vtkArrayIteratorTemplate.h +++ b/Common/Core/vtkArrayIteratorTemplate.h @@ -33,6 +33,7 @@ #include "vtkStdString.h" // For template instantiation #include "vtkVariant.h" // For template instantiation +VTK_ABI_NAMESPACE_BEGIN template class VTKCOMMONCORE_EXPORT vtkArrayIteratorTemplate : public vtkArrayIterator { @@ -133,6 +134,7 @@ extern template class VTKCOMMONCORE_EXPORT vtkArrayIteratorTemplate; #endif #endif // VTK_USE_EXTERN_TEMPLATE +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkArrayIteratorTemplate.h diff --git a/Common/Core/vtkArrayIteratorTemplate.txx b/Common/Core/vtkArrayIteratorTemplate.txx index 9a9b9056d4..2d0306a53b 100644 --- a/Common/Core/vtkArrayIteratorTemplate.txx +++ b/Common/Core/vtkArrayIteratorTemplate.txx @@ -21,6 +21,7 @@ #include "vtkObjectFactory.h" //----------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN template vtkArrayIteratorTemplate* vtkArrayIteratorTemplate::New() { @@ -130,4 +131,5 @@ void vtkArrayIteratorTemplate::PrintSelf(ostream& os, vtkIndent indent) } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkArrayIteratorTemplateInstantiate.cxx b/Common/Core/vtkArrayIteratorTemplateInstantiate.cxx index a6cdae8c32..11cfd3df46 100644 --- a/Common/Core/vtkArrayIteratorTemplateInstantiate.cxx +++ b/Common/Core/vtkArrayIteratorTemplateInstantiate.cxx @@ -16,6 +16,8 @@ #include "vtkArrayIteratorTemplate.txx" +VTK_ABI_NAMESPACE_BEGIN vtkInstantiateTemplateMacro(template class VTKCOMMONCORE_EXPORT vtkArrayIteratorTemplate); template class VTKCOMMONCORE_EXPORT vtkArrayIteratorTemplate; template class VTKCOMMONCORE_EXPORT vtkArrayIteratorTemplate; +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArrayPrint.h b/Common/Core/vtkArrayPrint.h index dae760f419..6be6491041 100644 --- a/Common/Core/vtkArrayPrint.h +++ b/Common/Core/vtkArrayPrint.h @@ -36,6 +36,7 @@ /// Serializes the contents of an array to a stream as a series of /// coordinates. For 2D arrays of double values, the output is compatible /// with the MatrixMarket "Coordinate Text File" format. +VTK_ABI_NAMESPACE_BEGIN template void vtkPrintCoordinateFormat(ostream& stream, vtkTypedArray* array); @@ -49,6 +50,7 @@ void vtkPrintMatrixFormat(ostream& stream, vtkTypedArray* matrix); template void vtkPrintVectorFormat(ostream& stream, vtkTypedArray* vector); +VTK_ABI_NAMESPACE_END #include "vtkArrayPrint.txx" #endif diff --git a/Common/Core/vtkArrayPrint.txx b/Common/Core/vtkArrayPrint.txx index 960011c28e..49da030d28 100644 --- a/Common/Core/vtkArrayPrint.txx +++ b/Common/Core/vtkArrayPrint.txx @@ -26,6 +26,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN template void vtkPrintCoordinateFormat(ostream& stream, vtkTypedArray* array) { @@ -104,4 +105,5 @@ void vtkPrintVectorFormat(ostream& stream, vtkTypedArray* vector) } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkArrayRange.cxx b/Common/Core/vtkArrayRange.cxx index de464da1ea..4002a0c3e8 100644 --- a/Common/Core/vtkArrayRange.cxx +++ b/Common/Core/vtkArrayRange.cxx @@ -23,6 +23,7 @@ #include // for std::max() +VTK_ABI_NAMESPACE_BEGIN vtkArrayRange::vtkArrayRange() : Begin(0) , End(0) @@ -75,3 +76,4 @@ ostream& operator<<(ostream& stream, const vtkArrayRange& rhs) stream << "[" << rhs.Begin << ", " << rhs.End << ")"; return stream; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArrayRange.h b/Common/Core/vtkArrayRange.h index 6312170152..c8cf6672d3 100644 --- a/Common/Core/vtkArrayRange.h +++ b/Common/Core/vtkArrayRange.h @@ -42,6 +42,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkArrayRange { public: @@ -112,5 +113,6 @@ private: ///@} }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkArrayRange.h diff --git a/Common/Core/vtkArraySort.cxx b/Common/Core/vtkArraySort.cxx index 0b743e9c1a..864b8c0394 100644 --- a/Common/Core/vtkArraySort.cxx +++ b/Common/Core/vtkArraySort.cxx @@ -21,6 +21,7 @@ #include "vtkArraySort.h" +VTK_ABI_NAMESPACE_BEGIN vtkArraySort::vtkArraySort() = default; vtkArraySort::vtkArraySort(DimensionT i) @@ -85,3 +86,4 @@ ostream& operator<<(ostream& stream, const vtkArraySort& rhs) return stream; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArraySort.h b/Common/Core/vtkArraySort.h index 7761d647e4..2890d18dcc 100644 --- a/Common/Core/vtkArraySort.h +++ b/Common/Core/vtkArraySort.h @@ -48,6 +48,7 @@ #include "vtkSystemIncludes.h" #include +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkArraySort { public: @@ -115,6 +116,7 @@ private: std::vector Storage; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkArraySort.h diff --git a/Common/Core/vtkArrayWeights.cxx b/Common/Core/vtkArrayWeights.cxx index 625dc5b5a2..710ace43f1 100644 --- a/Common/Core/vtkArrayWeights.cxx +++ b/Common/Core/vtkArrayWeights.cxx @@ -22,6 +22,7 @@ #include "vtkArrayWeights.h" #include +VTK_ABI_NAMESPACE_BEGIN class vtkArrayWeightsStorage { public: @@ -109,3 +110,4 @@ vtkArrayWeights& vtkArrayWeights::operator=(const vtkArrayWeights& other) *this->Storage = *other.Storage; return *this; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkArrayWeights.h b/Common/Core/vtkArrayWeights.h index 7edbe55b8f..6611b3c938 100644 --- a/Common/Core/vtkArrayWeights.h +++ b/Common/Core/vtkArrayWeights.h @@ -47,6 +47,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN class vtkArrayWeightsStorage; // pimpl class VTKCOMMONCORE_EXPORT vtkArrayWeights @@ -118,6 +119,7 @@ protected: vtkArrayWeightsStorage* Storage; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkArrayWeights.h diff --git a/Common/Core/vtkAtomicMutex.cxx b/Common/Core/vtkAtomicMutex.cxx index 24f93250ab..a7be9eb185 100644 --- a/Common/Core/vtkAtomicMutex.cxx +++ b/Common/Core/vtkAtomicMutex.cxx @@ -26,6 +26,8 @@ static inline __attribute__((always_inline)) void _mm_pause() #define _mm_pause() #endif +VTK_ABI_NAMESPACE_BEGIN + //------------------------------------------------------------------------------ vtkAtomicMutex::vtkAtomicMutex() : Locked(false) @@ -76,3 +78,4 @@ void vtkAtomicMutex::unlock() { this->Locked.store(false, std::memory_order_release); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkAtomicMutex.h b/Common/Core/vtkAtomicMutex.h index 801838b3c9..fd01d34d04 100644 --- a/Common/Core/vtkAtomicMutex.h +++ b/Common/Core/vtkAtomicMutex.h @@ -30,6 +30,8 @@ #include "vtkCommonCoreModule.h" // For export macro #include // For std::atomic +VTK_ABI_NAMESPACE_BEGIN + class VTKCOMMONCORE_EXPORT vtkAtomicMutex { public: @@ -54,5 +56,6 @@ private: std::atomic_bool Locked; }; +VTK_ABI_NAMESPACE_END #endif // vtkAtomicMutex_h // VTK-HeaderTest-Exclude: vtkAtomicMutex.h diff --git a/Common/Core/vtkAutoInit.h b/Common/Core/vtkAutoInit.h index e657982904..1821793e92 100644 --- a/Common/Core/vtkAutoInit.h +++ b/Common/Core/vtkAutoInit.h @@ -15,6 +15,7 @@ #ifndef vtkAutoInit_h #define vtkAutoInit_h +#include "vtkABINamespace.h" #include "vtkDebugLeaksManager.h" // DebugLeaks exists longer. #include "vtkTimeStamp.h" // Here so that TimeStamp Schwarz initializer works @@ -49,7 +50,9 @@ VTK_AUTOINIT_DECLARE_7(t1, t2, t3, t4, t5, t6, t7) VTK_AUTOINIT_DECLARE(t8) #define VTK_AUTOINIT_DECLARE_9(t1, t2, t3, t4, t5, t6, t7, t8, t9) \ VTK_AUTOINIT_DECLARE_8(t1, t2, t3, t4, t5, t6, t7, t8) VTK_AUTOINIT_DECLARE(t9) -#define VTK_AUTOINIT_DECLARE(M) void M##_AutoInit_Construct(); +#define VTK_AUTOINIT_DECLARE(M) \ + VTK_ABI_NAMESPACE_BEGIN void M##_AutoInit_Construct(); \ + VTK_ABI_NAMESPACE_END #define VTK_AUTOINIT_CONSTRUCT_0() #define VTK_AUTOINIT_CONSTRUCT_1(t1) VTK_AUTOINIT_CONSTRUCT_0() VTK_AUTOINIT_CONSTRUCT(t1) @@ -84,13 +87,14 @@ // The above snippet if included in the global scope will ensure the object // factories for vtkRenderingOpenGL2 are correctly registered and unregistered. #define VTK_MODULE_INIT(M) \ - VTK_AUTOINIT_DECLARE(M) namespace \ + VTK_AUTOINIT_DECLARE(M) \ + namespace \ { \ - static struct M##_ModuleInit \ - { \ - /* Call _AutoInit_Construct during initialization. */ \ - M##_ModuleInit() { VTK_AUTOINIT_CONSTRUCT(M) } \ - } M##_ModuleInit_Instance; \ + static struct M##_ModuleInit \ + { \ + /* Call _AutoInit_Construct during initialization. */ \ + M##_ModuleInit() { VTK_AUTOINIT_CONSTRUCT(M) } \ + } M##_ModuleInit_Instance; \ } #endif diff --git a/Common/Core/vtkBitArray.cxx b/Common/Core/vtkBitArray.cxx index 366a52c51a..93b7347792 100644 --- a/Common/Core/vtkBitArray.cxx +++ b/Common/Core/vtkBitArray.cxx @@ -18,6 +18,7 @@ #include "vtkIdList.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN namespace { constexpr unsigned char InitializationMaskForUnusedBitsOfLastByte[8] = { 0x80, 0xc0, 0xe0, 0xf0, @@ -836,3 +837,4 @@ void vtkBitArray::ClearLookup() delete this->Lookup; this->Lookup = nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkBitArray.h b/Common/Core/vtkBitArray.h index 03f5f28ff5..bd2682340a 100644 --- a/Common/Core/vtkBitArray.h +++ b/Common/Core/vtkBitArray.h @@ -28,6 +28,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkDataArray.h" +VTK_ABI_NAMESPACE_BEGIN class vtkBitArrayLookup; class VTKCOMMONCORE_EXPORT vtkBitArray : public vtkDataArray @@ -392,4 +393,5 @@ inline void vtkBitArray::Squeeze() { this->ResizeAndExtend(this->MaxId + 1); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkBitArrayIterator.cxx b/Common/Core/vtkBitArrayIterator.cxx index a57b2a275f..9f8dc5980c 100644 --- a/Common/Core/vtkBitArrayIterator.cxx +++ b/Common/Core/vtkBitArrayIterator.cxx @@ -17,6 +17,7 @@ #include "vtkBitArray.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBitArrayIterator); vtkCxxSetObjectMacro(vtkBitArrayIterator, Array, vtkBitArray); //------------------------------------------------------------------------------ @@ -147,3 +148,4 @@ void vtkBitArrayIterator::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkBitArrayIterator.h b/Common/Core/vtkBitArrayIterator.h index ec0d447974..7afbbc39f1 100644 --- a/Common/Core/vtkBitArrayIterator.h +++ b/Common/Core/vtkBitArrayIterator.h @@ -25,6 +25,7 @@ #include "vtkArrayIterator.h" #include "vtkCommonCoreModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkBitArray; class VTKCOMMONCORE_EXPORT vtkBitArrayIterator : public vtkArrayIterator { @@ -107,4 +108,5 @@ private: void operator=(const vtkBitArrayIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkBoxMuellerRandomSequence.cxx b/Common/Core/vtkBoxMuellerRandomSequence.cxx index 928527cf36..6e201ea825 100644 --- a/Common/Core/vtkBoxMuellerRandomSequence.cxx +++ b/Common/Core/vtkBoxMuellerRandomSequence.cxx @@ -18,6 +18,7 @@ #include "vtkObjectFactory.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBoxMuellerRandomSequence); //------------------------------------------------------------------------------ @@ -94,3 +95,4 @@ void vtkBoxMuellerRandomSequence::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkBoxMuellerRandomSequence.h b/Common/Core/vtkBoxMuellerRandomSequence.h index f9d9b21ad5..32d0f4865e 100644 --- a/Common/Core/vtkBoxMuellerRandomSequence.h +++ b/Common/Core/vtkBoxMuellerRandomSequence.h @@ -29,6 +29,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkGaussianRandomSequence.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkBoxMuellerRandomSequence : public vtkGaussianRandomSequence { public: @@ -80,4 +81,5 @@ private: void operator=(const vtkBoxMuellerRandomSequence&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // #ifndef vtkBoxMuellerRandomSequence_h diff --git a/Common/Core/vtkBreakPoint.cxx b/Common/Core/vtkBreakPoint.cxx index 4eb41de5d0..b8b968c80e 100644 --- a/Common/Core/vtkBreakPoint.cxx +++ b/Common/Core/vtkBreakPoint.cxx @@ -19,6 +19,7 @@ #endif //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkBreakPoint::Break() { #ifndef _WIN32 @@ -32,3 +33,4 @@ void vtkBreakPoint::Break() } #endif } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkBreakPoint.h b/Common/Core/vtkBreakPoint.h index 9ac82849c9..8c77500baf 100644 --- a/Common/Core/vtkBreakPoint.h +++ b/Common/Core/vtkBreakPoint.h @@ -39,6 +39,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" // to get VTKCOMMONCORE_EXPORT +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkBreakPoint { public: @@ -51,5 +52,6 @@ public: ///@} }; +VTK_ABI_NAMESPACE_END #endif // #ifndef vtkBreakPoint_h // VTK-HeaderTest-Exclude: vtkBreakPoint.h diff --git a/Common/Core/vtkBuffer.h b/Common/Core/vtkBuffer.h index b15aa9bf1e..2431e7d9bd 100644 --- a/Common/Core/vtkBuffer.h +++ b/Common/Core/vtkBuffer.h @@ -30,6 +30,7 @@ #include // for std::min and std::copy +VTK_ABI_NAMESPACE_BEGIN template class vtkBuffer : public vtkObject { @@ -262,5 +263,6 @@ bool vtkBuffer::Reallocate(vtkIdType newsize) return true; } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkBuffer.h diff --git a/Common/Core/vtkByteSwap.cxx b/Common/Core/vtkByteSwap.cxx index d82f7534b9..4c2e1ddafb 100644 --- a/Common/Core/vtkByteSwap.cxx +++ b/Common/Core/vtkByteSwap.cxx @@ -19,6 +19,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkByteSwap); //------------------------------------------------------------------------------ @@ -361,3 +362,4 @@ void vtkByteSwap::SwapVoidRange(void* buffer, size_t numWords, size_t wordSize) buf += half; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkByteSwap.h b/Common/Core/vtkByteSwap.h index 7bab3817cf..eace045a49 100644 --- a/Common/Core/vtkByteSwap.h +++ b/Common/Core/vtkByteSwap.h @@ -27,6 +27,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkByteSwap : public vtkObject { public: @@ -142,4 +143,5 @@ private: void operator=(const vtkByteSwap&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkCallbackCommand.cxx b/Common/Core/vtkCallbackCommand.cxx index 2ea87defc4..b3850792bf 100644 --- a/Common/Core/vtkCallbackCommand.cxx +++ b/Common/Core/vtkCallbackCommand.cxx @@ -16,6 +16,7 @@ #include "vtkCallbackCommand.h" //---------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN vtkCallbackCommand::vtkCallbackCommand() { this->ClientData = nullptr; @@ -45,3 +46,4 @@ void vtkCallbackCommand::Execute(vtkObject* caller, unsigned long event, void* c } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkCallbackCommand.h b/Common/Core/vtkCallbackCommand.h index a0fffac170..691afc3e31 100644 --- a/Common/Core/vtkCallbackCommand.h +++ b/Common/Core/vtkCallbackCommand.h @@ -41,6 +41,7 @@ #include "vtkCommand.h" #include "vtkCommonCoreModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkCallbackCommand : public vtkCommand { public: @@ -90,6 +91,7 @@ protected: ~vtkCallbackCommand() override; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkCallbackCommand.h diff --git a/Common/Core/vtkCharArray.cxx b/Common/Core/vtkCharArray.cxx index 8f76b22001..04ce47aa77 100644 --- a/Common/Core/vtkCharArray.cxx +++ b/Common/Core/vtkCharArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(char); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCharArray); vtkStandardExtendedNewMacro(vtkCharArray); @@ -36,3 +37,4 @@ void vtkCharArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkCharArray.h b/Common/Core/vtkCharArray.h index 3f71b19c97..cbd7411c86 100644 --- a/Common/Core/vtkCharArray.h +++ b/Common/Core/vtkCharArray.h @@ -45,6 +45,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkCharArray : public vtkDataArray { public: @@ -95,4 +96,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkCharArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkCollection.cxx b/Common/Core/vtkCollection.cxx index c5db36acf7..c2b9c3924b 100644 --- a/Common/Core/vtkCollection.cxx +++ b/Common/Core/vtkCollection.cxx @@ -22,6 +22,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCollection); // Construct with empty list. @@ -344,3 +345,4 @@ void vtkCollection::ReportReferences(vtkGarbageCollector* collector) vtkGarbageCollectorReport(collector, elem->Item, "Element"); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkCollection.h b/Common/Core/vtkCollection.h index 618873940f..b3f3a2cc1e 100644 --- a/Common/Core/vtkCollection.h +++ b/Common/Core/vtkCollection.h @@ -34,6 +34,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCollectionElement //;prevents pick-up by man page generator { public: @@ -205,4 +206,5 @@ inline vtkObject* vtkCollection::GetNextItemAsObject(void*& cookie) } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkCollectionIterator.cxx b/Common/Core/vtkCollectionIterator.cxx index c0ea6c584c..7cd6fd75f0 100644 --- a/Common/Core/vtkCollectionIterator.cxx +++ b/Common/Core/vtkCollectionIterator.cxx @@ -16,6 +16,7 @@ #include "vtkCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCollectionIterator); //------------------------------------------------------------------------------ @@ -89,3 +90,4 @@ vtkObject* vtkCollectionIterator::GetCurrentObject() } return nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkCollectionIterator.h b/Common/Core/vtkCollectionIterator.h index 3e048164b4..1925561c30 100644 --- a/Common/Core/vtkCollectionIterator.h +++ b/Common/Core/vtkCollectionIterator.h @@ -31,6 +31,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCollection; class vtkCollectionElement; @@ -93,4 +94,5 @@ private: void operator=(const vtkCollectionIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkCollectionRange.h b/Common/Core/vtkCollectionRange.h index 9ac161b03d..17c5c486f9 100644 --- a/Common/Core/vtkCollectionRange.h +++ b/Common/Core/vtkCollectionRange.h @@ -27,6 +27,7 @@ namespace vtk { namespace detail { +VTK_ABI_NAMESPACE_BEGIN template struct CollectionRange; @@ -227,6 +228,7 @@ private: vtkSmartPointer Collection; }; +VTK_ABI_NAMESPACE_END } } // end namespace vtk::detail diff --git a/Common/Core/vtkCommand.cxx b/Common/Core/vtkCommand.cxx index c7fc1f2d60..8d64264cc0 100644 --- a/Common/Core/vtkCommand.cxx +++ b/Common/Core/vtkCommand.cxx @@ -17,6 +17,7 @@ #include "vtkDebugLeaks.h" //---------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN vtkCommand::vtkCommand() : AbortFlag(0) , PassiveObserver(0) @@ -110,3 +111,4 @@ const char* vtkCommand::GetDebugClassName() const { return "vtkCommand or subclass"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkCommand.h b/Common/Core/vtkCommand.h index 0586c73056..e8c5239c54 100644 --- a/Common/Core/vtkCommand.h +++ b/Common/Core/vtkCommand.h @@ -391,6 +391,7 @@ } // The superclass that all commands should be subclasses of +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkCommand : public vtkObjectBase { public: @@ -481,6 +482,7 @@ private: const char* GetDebugClassName() const final; }; +VTK_ABI_NAMESPACE_END #endif /* vtkCommand_h */ // VTK-HeaderTest-Exclude: vtkCommand.h diff --git a/Common/Core/vtkCommonInformationKeyManager.cxx b/Common/Core/vtkCommonInformationKeyManager.cxx index bdff30d53b..53474360b8 100644 --- a/Common/Core/vtkCommonInformationKeyManager.cxx +++ b/Common/Core/vtkCommonInformationKeyManager.cxx @@ -20,6 +20,7 @@ // Subclass vector so we can directly call constructor. This works // around problems on Borland C++. +VTK_ABI_NAMESPACE_BEGIN struct vtkCommonInformationKeyManagerKeysType : public std::vector { typedef std::vector Superclass; @@ -92,3 +93,4 @@ void vtkCommonInformationKeyManager::ClassFinalize() vtkCommonInformationKeyManagerKeys = nullptr; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkCommonInformationKeyManager.h b/Common/Core/vtkCommonInformationKeyManager.h index e75dba6c6e..40d541f83b 100644 --- a/Common/Core/vtkCommonInformationKeyManager.h +++ b/Common/Core/vtkCommonInformationKeyManager.h @@ -30,6 +30,7 @@ #include "vtkDebugLeaksManager.h" // DebugLeaks exists longer than info keys. +VTK_ABI_NAMESPACE_BEGIN class vtkInformationKey; class VTKCOMMONCORE_EXPORT vtkCommonInformationKeyManager @@ -61,5 +62,6 @@ private: // initialized before and destroyed after it is used. static vtkCommonInformationKeyManager vtkCommonInformationKeyManagerInstance; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkCommonInformationKeyManager.h diff --git a/Common/Core/vtkCreateArrayDispatchArrayList.cmake b/Common/Core/vtkCreateArrayDispatchArrayList.cmake index 170459135c..bdeb9e36da 100644 --- a/Common/Core/vtkCreateArrayDispatchArrayList.cmake +++ b/Common/Core/vtkCreateArrayDispatchArrayList.cmake @@ -191,6 +191,7 @@ endforeach() list(APPEND temp "\n" "namespace vtkArrayDispatch {\n" + "VTK_ABI_NAMESPACE_BEGIN\n" "\n" "typedef vtkTypeList::Unique<\n" " vtkTypeList::Create<\n" @@ -208,8 +209,9 @@ list(APPEND temp " >\n" ">::Result Arrays\;\n" "\n" - "} // end namespace vtkArrayDispatch\n" + "VTK_ABI_NAMESPACE_END\n" "\n" + "} // end namespace vtkArrayDispatch\n" "#endif // vtkArrayDispatchArrayList_h\n" ) diff --git a/Common/Core/vtkCriticalSection.cxx b/Common/Core/vtkCriticalSection.cxx index 8dc40338ae..b3c092de63 100644 --- a/Common/Core/vtkCriticalSection.cxx +++ b/Common/Core/vtkCriticalSection.cxx @@ -21,9 +21,11 @@ #include "vtkCriticalSection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCriticalSection); void vtkCriticalSection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkCriticalSection.h b/Common/Core/vtkCriticalSection.h index ec3b284bd3..d678ce2e9b 100644 --- a/Common/Core/vtkCriticalSection.h +++ b/Common/Core/vtkCriticalSection.h @@ -41,6 +41,7 @@ #include "vtkObject.h" #include // for std::mutex +VTK_ABI_NAMESPACE_BEGIN // Remove with VTK_DEPRECATED_IN_9_2_0 because it was not actually deprecated // in 9.1.0. class VTK_DEPRECATED_IN_9_1_0("Use std::mutex instead") VTKCOMMONCORE_EXPORT vtkCriticalSection @@ -82,6 +83,7 @@ inline void vtkCriticalSection::Unlock() this->mtx.unlock(); } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkCriticalSection.h diff --git a/Common/Core/vtkDataArray.cxx b/Common/Core/vtkDataArray.cxx index ac9a5c28a6..0c526bd2df 100644 --- a/Common/Core/vtkDataArray.cxx +++ b/Common/Core/vtkDataArray.cxx @@ -442,6 +442,8 @@ bool hasValidKey(InfoType info, KeyType key, ComponentKeyType ckey, double range } // end anon namespace +VTK_ABI_NAMESPACE_BEGIN + vtkInformationKeyRestrictedMacro(vtkDataArray, COMPONENT_RANGE, DoubleVector, 2); vtkInformationKeyRestrictedMacro(vtkDataArray, L2_NORM_RANGE, DoubleVector, 2); vtkInformationKeyRestrictedMacro(vtkDataArray, L2_NORM_FINITE_RANGE, DoubleVector, 2); @@ -1488,6 +1490,7 @@ void vtkDataArray::Fill(double value) this->FillComponent(i, value); } } +VTK_ABI_NAMESPACE_END namespace { @@ -1520,6 +1523,7 @@ struct CopyComponentWorker }; } +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ void vtkDataArray::CopyComponent(int dstComponent, vtkDataArray* src, int srcComponent) { @@ -1760,6 +1764,7 @@ void vtkDataArray::Modified() } this->Superclass::Modified(); } +VTK_ABI_NAMESPACE_END namespace { @@ -1864,6 +1869,7 @@ struct FiniteVectorRangeDispatchWrapper } // end anon namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ bool vtkDataArray::ComputeScalarRange(double* ranges) { @@ -2078,3 +2084,4 @@ void vtkDataArray::PrintSelf(ostream& os, vtkIndent indent) os << indent << "LookupTable: (none)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkDataArray.h b/Common/Core/vtkDataArray.h index 3376cd031e..c244b0e15a 100644 --- a/Common/Core/vtkDataArray.h +++ b/Common/Core/vtkDataArray.h @@ -39,6 +39,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkVTK_USE_SCALED_SOA_ARRAYS.h" // For #define of VTK_USE_SCALED_SOA_ARRAYS +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkIdList; class vtkInformationStringKey; @@ -708,17 +709,20 @@ inline vtkDataArray* vtkDataArray::FastDownCast(vtkAbstractArray* source) } vtkArrayDownCast_FastCastMacro(vtkDataArray); +VTK_ABI_NAMESPACE_END // These are used by vtkDataArrayPrivate.txx, but need to be available to // vtkGenericDataArray.h as well. namespace vtkDataArrayPrivate { +VTK_ABI_NAMESPACE_BEGIN struct AllValues { }; struct FiniteValues { }; +VTK_ABI_NAMESPACE_END } #endif diff --git a/Common/Core/vtkDataArrayAccessor.h b/Common/Core/vtkDataArrayAccessor.h index d25d8efdf0..c2224a4be2 100644 --- a/Common/Core/vtkDataArrayAccessor.h +++ b/Common/Core/vtkDataArrayAccessor.h @@ -101,6 +101,7 @@ #define vtkDataArrayAccessor_h // Generic form for all (non-bit) vtkDataArray subclasses. +VTK_ABI_NAMESPACE_BEGIN template struct vtkDataArrayAccessor { @@ -199,5 +200,6 @@ struct vtkDataArrayAccessor } }; +VTK_ABI_NAMESPACE_END #endif // vtkDataArrayAccessor_h // VTK-HeaderTest-Exclude: vtkDataArrayAccessor.h diff --git a/Common/Core/vtkDataArrayCollection.cxx b/Common/Core/vtkDataArrayCollection.cxx index 63071e7398..aa43cea02d 100644 --- a/Common/Core/vtkDataArrayCollection.cxx +++ b/Common/Core/vtkDataArrayCollection.cxx @@ -15,9 +15,11 @@ #include "vtkDataArrayCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDataArrayCollection); void vtkDataArrayCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkDataArrayCollection.h b/Common/Core/vtkDataArrayCollection.h index a3870c14ff..69da96d73b 100644 --- a/Common/Core/vtkDataArrayCollection.h +++ b/Common/Core/vtkDataArrayCollection.h @@ -28,6 +28,7 @@ #include "vtkDataArray.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkDataArrayCollection : public vtkCollection { public: @@ -72,4 +73,5 @@ private: void operator=(const vtkDataArrayCollection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkDataArrayCollectionIterator.cxx b/Common/Core/vtkDataArrayCollectionIterator.cxx index d8bebdec1d..9c9c7d5ec4 100644 --- a/Common/Core/vtkDataArrayCollectionIterator.cxx +++ b/Common/Core/vtkDataArrayCollectionIterator.cxx @@ -17,6 +17,7 @@ #include "vtkDataArrayCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDataArrayCollectionIterator); //------------------------------------------------------------------------------ @@ -59,3 +60,4 @@ vtkDataArray* vtkDataArrayCollectionIterator::GetDataArray() { return static_cast(this->GetCurrentObject()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkDataArrayCollectionIterator.h b/Common/Core/vtkDataArrayCollectionIterator.h index 0fb26728ff..67e1aee69a 100644 --- a/Common/Core/vtkDataArrayCollectionIterator.h +++ b/Common/Core/vtkDataArrayCollectionIterator.h @@ -27,6 +27,7 @@ #include "vtkCollectionIterator.h" #include "vtkCommonCoreModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkDataArrayCollection; @@ -60,4 +61,5 @@ private: void operator=(const vtkDataArrayCollectionIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkDataArrayMeta.h b/Common/Core/vtkDataArrayMeta.h index 376244bdfd..6e14192126 100644 --- a/Common/Core/vtkDataArrayMeta.h +++ b/Common/Core/vtkDataArrayMeta.h @@ -58,19 +58,24 @@ VTK_ITER_OPTIMIZE_START // For IsAOSDataArray: +VTK_ABI_NAMESPACE_BEGIN template class vtkAOSDataArrayTemplate; +VTK_ABI_NAMESPACE_END namespace vtk { +VTK_ABI_NAMESPACE_BEGIN // Typedef for data array indices: using ComponentIdType = int; using TupleIdType = vtkIdType; using ValueIdType = vtkIdType; +VTK_ABI_NAMESPACE_END namespace detail { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // Used by ranges/iterators when tuple size is unknown at compile time @@ -180,16 +185,22 @@ struct GetAPITypeImpl using APIType = double; }; +VTK_ABI_NAMESPACE_END } // end namespace detail +VTK_ABI_NAMESPACE_BEGIN + //------------------------------------------------------------------------------ // Typedef for double if vtkDataArray, or the array's ValueType for subclasses. template > using GetAPIType = typename detail::GetAPITypeImpl::APIType; +VTK_ABI_NAMESPACE_END + //------------------------------------------------------------------------------ namespace detail { +VTK_ABI_NAMESPACE_BEGIN template struct IsAOSDataArrayImpl @@ -198,13 +209,16 @@ struct IsAOSDataArrayImpl static constexpr bool value = std::is_base_of, ArrayType>::value; }; +VTK_ABI_NAMESPACE_END } // end namespace detail +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // True if ArrayType inherits some specialization of vtkAOSDataArrayTemplate template using IsAOSDataArray = std::integral_constant::value>; +VTK_ABI_NAMESPACE_END } // end namespace vtk VTK_ITER_OPTIMIZE_END diff --git a/Common/Core/vtkDataArrayPrivate.txx b/Common/Core/vtkDataArrayPrivate.txx index 89c0a92f00..7cbf636694 100644 --- a/Common/Core/vtkDataArrayPrivate.txx +++ b/Common/Core/vtkDataArrayPrivate.txx @@ -33,6 +33,7 @@ namespace vtkDataArrayPrivate { +VTK_ABI_NAMESPACE_BEGIN #if (defined(_MSC_VER) && (_MSC_VER < 2000)) || \ (defined(__INTEL_COMPILER) && (__INTEL_COMPILER < 1700)) namespace msvc @@ -634,6 +635,7 @@ bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], FiniteValues, return true; } +VTK_ABI_NAMESPACE_END } // end namespace vtkDataArrayPrivate #endif // VTK_GDA_TEMPLATE_EXTERN #endif diff --git a/Common/Core/vtkDataArrayRange.h b/Common/Core/vtkDataArrayRange.h index b38b1a7e49..eca64c9c0e 100644 --- a/Common/Core/vtkDataArrayRange.h +++ b/Common/Core/vtkDataArrayRange.h @@ -97,9 +97,9 @@ VTK_ITER_OPTIMIZE_START namespace vtk { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN // Internal detail: This utility is not directly needed by users of // DataArrayRange. @@ -147,6 +147,7 @@ public: TupleSize>(std::declval()))>::type; }; +VTK_ABI_NAMESPACE_END } // end namespace detail /** @@ -253,6 +254,7 @@ public: * } * ``` */ +VTK_ABI_NAMESPACE_BEGIN template VTK_ITER_INLINE auto DataArrayTupleRange(const ArrayTypePtr& array, TupleIdType start = -1, @@ -375,6 +377,7 @@ VTK_ITER_INLINE auto DataArrayValueRange(const ArrayTypePtr& array, ValueIdType return RangeType(array, start < 0 ? 0 : start, end < 0 ? array->GetNumberOfValues() : end); } +VTK_ABI_NAMESPACE_END } // end namespace vtk VTK_ITER_OPTIMIZE_END diff --git a/Common/Core/vtkDataArraySelection.cxx b/Common/Core/vtkDataArraySelection.cxx index 78af95b5ca..c80b0f4757 100644 --- a/Common/Core/vtkDataArraySelection.cxx +++ b/Common/Core/vtkDataArraySelection.cxx @@ -20,6 +20,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDataArraySelection); class vtkDataArraySelection::vtkInternals @@ -402,3 +403,4 @@ void vtkDataArraySelection::Union(vtkDataArraySelection* other, bool skipModifie this->Modified(); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkDataArraySelection.h b/Common/Core/vtkDataArraySelection.h index da14e00a40..b0e6d542b1 100644 --- a/Common/Core/vtkDataArraySelection.h +++ b/Common/Core/vtkDataArraySelection.h @@ -41,6 +41,7 @@ #include // for std::unique_ptr +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkDataArraySelection : public vtkObject { public: @@ -247,4 +248,5 @@ private: int UnknownArraySetting; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkDataArrayTupleRange_AOS.h b/Common/Core/vtkDataArrayTupleRange_AOS.h index 0ad04f9099..37a52b2082 100644 --- a/Common/Core/vtkDataArrayTupleRange_AOS.h +++ b/Common/Core/vtkDataArrayTupleRange_AOS.h @@ -36,9 +36,9 @@ VTK_ITER_OPTIMIZE_START namespace vtk { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN // Forward decs for friends/args template @@ -988,6 +988,7 @@ template ::value>::type> TupleRange DeclareTupleRangeSpecialization(ArrayType*); +VTK_ABI_NAMESPACE_END } // end namespace detail } // end namespace vtk diff --git a/Common/Core/vtkDataArrayTupleRange_Generic.h b/Common/Core/vtkDataArrayTupleRange_Generic.h index a54071acbc..acdf4af3cb 100644 --- a/Common/Core/vtkDataArrayTupleRange_Generic.h +++ b/Common/Core/vtkDataArrayTupleRange_Generic.h @@ -33,9 +33,9 @@ VTK_ITER_OPTIMIZE_START namespace vtk { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN // Forward decs for friends/args template @@ -1743,6 +1743,7 @@ private: template TupleRange DeclareTupleRangeSpecialization(vtkDataArray*); +VTK_ABI_NAMESPACE_END } // end namespace detail } // end namespace vtk diff --git a/Common/Core/vtkDataArrayValueRange_AOS.h b/Common/Core/vtkDataArrayValueRange_AOS.h index 7a9ac07bfe..809848a9c4 100644 --- a/Common/Core/vtkDataArrayValueRange_AOS.h +++ b/Common/Core/vtkDataArrayValueRange_AOS.h @@ -36,9 +36,9 @@ VTK_ITER_OPTIMIZE_START namespace vtk { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // ValueRange @@ -155,6 +155,7 @@ template ::value>::type> ValueRange DeclareValueRangeSpecialization(ArrayType*); +VTK_ABI_NAMESPACE_END } } // end namespace vtk::detail diff --git a/Common/Core/vtkDataArrayValueRange_Generic.h b/Common/Core/vtkDataArrayValueRange_Generic.h index 661076a4ea..4f53a93679 100644 --- a/Common/Core/vtkDataArrayValueRange_Generic.h +++ b/Common/Core/vtkDataArrayValueRange_Generic.h @@ -33,9 +33,9 @@ VTK_ITER_OPTIMIZE_START namespace vtk { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN // Forward decs for friends/args template @@ -952,6 +952,7 @@ private: template ValueRange DeclareValueRangeSpecialization(vtkDataArray*); +VTK_ABI_NAMESPACE_END } // end namespace detail } // end namespace vtk diff --git a/Common/Core/vtkDebugLeaks.cxx b/Common/Core/vtkDebugLeaks.cxx index 1856433bc2..04ce776e4b 100644 --- a/Common/Core/vtkDebugLeaks.cxx +++ b/Common/Core/vtkDebugLeaks.cxx @@ -30,6 +30,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN static const char* vtkDebugLeaksIgnoreClasses[] = { nullptr }; //------------------------------------------------------------------------------ @@ -456,3 +457,4 @@ int vtkDebugLeaks::ExitError; // Purposely not initialized. ClassInitialize will handle it. vtkDebugLeaksObserver* vtkDebugLeaks::Observer; +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkDebugLeaks.h b/Common/Core/vtkDebugLeaks.h index be4c1577f3..f494906afb 100644 --- a/Common/Core/vtkDebugLeaks.h +++ b/Common/Core/vtkDebugLeaks.h @@ -57,6 +57,7 @@ #include // for std::mutex +VTK_ABI_NAMESPACE_BEGIN class vtkDebugLeaksHashTable; class vtkDebugLeaksTraceManager; class vtkDebugLeaksObserver; @@ -143,4 +144,5 @@ public: virtual void DestructingObject(vtkObjectBase*) = 0; }; +VTK_ABI_NAMESPACE_END #endif // vtkDebugLeaks_h diff --git a/Common/Core/vtkDebugLeaksManager.cxx b/Common/Core/vtkDebugLeaksManager.cxx index 4575255af4..a82f19dc35 100644 --- a/Common/Core/vtkDebugLeaksManager.cxx +++ b/Common/Core/vtkDebugLeaksManager.cxx @@ -24,6 +24,7 @@ // Must NOT be initialized. Default initialization to zero is // necessary. +VTK_ABI_NAMESPACE_BEGIN static unsigned int vtkDebugLeaksManagerCount; vtkDebugLeaksManager::vtkDebugLeaksManager() @@ -45,3 +46,4 @@ vtkDebugLeaksManager::~vtkDebugLeaksManager() #if defined(_MSC_VER) #pragma optimize("g", on) #endif +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkDebugLeaksManager.h b/Common/Core/vtkDebugLeaksManager.h index 546a28ce7c..4be874b05f 100644 --- a/Common/Core/vtkDebugLeaksManager.h +++ b/Common/Core/vtkDebugLeaksManager.h @@ -28,6 +28,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkDebugLeaksManager { public: @@ -45,5 +46,6 @@ private: // static object destroyed. static vtkDebugLeaksManager vtkDebugLeaksManagerInstance; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkDebugLeaksManager.h diff --git a/Common/Core/vtkDenseArray.h b/Common/Core/vtkDenseArray.h index 2c49676d6a..a2b3708def 100644 --- a/Common/Core/vtkDenseArray.h +++ b/Common/Core/vtkDenseArray.h @@ -50,6 +50,7 @@ #include "vtkObjectFactory.h" #include "vtkTypedArray.h" +VTK_ABI_NAMESPACE_BEGIN template class vtkDenseArray : public vtkTypedArray { @@ -229,6 +230,7 @@ private: ///@} }; +VTK_ABI_NAMESPACE_END #include "vtkDenseArray.txx" #endif diff --git a/Common/Core/vtkDenseArray.txx b/Common/Core/vtkDenseArray.txx index 578703a45f..c2582bdf7b 100644 --- a/Common/Core/vtkDenseArray.txx +++ b/Common/Core/vtkDenseArray.txx @@ -27,6 +27,7 @@ /////////////////////////////////////////////////////////////////////////////// // vtkDenseArray::MemoryBlock +VTK_ABI_NAMESPACE_BEGIN template vtkDenseArray::MemoryBlock::~MemoryBlock() = default; @@ -370,4 +371,5 @@ void vtkDenseArray::Reconfigure(const vtkArrayExtents& extents, MemoryBlock* } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkDoubleArray.cxx b/Common/Core/vtkDoubleArray.cxx index ca1df9635d..e321be3aad 100644 --- a/Common/Core/vtkDoubleArray.cxx +++ b/Common/Core/vtkDoubleArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(double); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDoubleArray); vtkStandardExtendedNewMacro(vtkDoubleArray); @@ -36,3 +37,4 @@ void vtkDoubleArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkDoubleArray.h b/Common/Core/vtkDoubleArray.h index aaa9dea951..79d85b88ee 100644 --- a/Common/Core/vtkDoubleArray.h +++ b/Common/Core/vtkDoubleArray.h @@ -32,6 +32,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkDoubleArray : public vtkDataArray { public: @@ -82,4 +83,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkDoubleArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkDynamicLoader.cxx b/Common/Core/vtkDynamicLoader.cxx index 960cebbd30..a487e8980a 100644 --- a/Common/Core/vtkDynamicLoader.cxx +++ b/Common/Core/vtkDynamicLoader.cxx @@ -18,6 +18,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkDynamicLoader* vtkDynamicLoader::New() { VTK_STANDARD_NEW_BODY(vtkDynamicLoader); @@ -70,3 +71,4 @@ const char* vtkDynamicLoader::LastError() { return vtksys::DynamicLoader::LastError(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkDynamicLoader.h b/Common/Core/vtkDynamicLoader.h index 1859e99a5a..1d91e7f2da 100644 --- a/Common/Core/vtkDynamicLoader.h +++ b/Common/Core/vtkDynamicLoader.h @@ -32,6 +32,7 @@ typedef vtksys::DynamicLoader::LibraryHandle vtkLibHandle; typedef vtksys::DynamicLoader::SymbolPointer vtkSymbolPointer; +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkDynamicLoader : public vtkObject { public: @@ -82,4 +83,5 @@ private: void operator=(const vtkDynamicLoader&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkEventData.h b/Common/Core/vtkEventData.h index 8ce24acc22..2aa33337ab 100644 --- a/Common/Core/vtkEventData.h +++ b/Common/Core/vtkEventData.h @@ -22,6 +22,7 @@ #include "vtkCommand.h" // enumeration of possible devices +VTK_ABI_NAMESPACE_BEGIN enum class vtkEventDataDevice { Unknown = -1, @@ -245,6 +246,7 @@ private: void operator=(const vtkEventDataDevice3D&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkEventData.h diff --git a/Common/Core/vtkEventForwarderCommand.cxx b/Common/Core/vtkEventForwarderCommand.cxx index b98f025752..fcf8ee83d4 100644 --- a/Common/Core/vtkEventForwarderCommand.cxx +++ b/Common/Core/vtkEventForwarderCommand.cxx @@ -17,6 +17,7 @@ #include "vtkObject.h" //---------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN vtkEventForwarderCommand::vtkEventForwarderCommand() { this->Target = nullptr; @@ -30,3 +31,4 @@ void vtkEventForwarderCommand::Execute(vtkObject*, unsigned long event, void* ca this->Target->InvokeEvent(event, call_data); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkEventForwarderCommand.h b/Common/Core/vtkEventForwarderCommand.h index df47aeee69..66c2377591 100644 --- a/Common/Core/vtkEventForwarderCommand.h +++ b/Common/Core/vtkEventForwarderCommand.h @@ -31,6 +31,7 @@ #include "vtkCommand.h" #include "vtkCommonCoreModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkEventForwarderCommand : public vtkCommand { public: @@ -60,6 +61,7 @@ protected: ~vtkEventForwarderCommand() override = default; }; +VTK_ABI_NAMESPACE_END #endif /* vtkEventForwarderCommand_h */ // VTK-HeaderTest-Exclude: vtkEventForwarderCommand.h diff --git a/Common/Core/vtkFileOutputWindow.cxx b/Common/Core/vtkFileOutputWindow.cxx index 679804929a..ead9e37078 100644 --- a/Common/Core/vtkFileOutputWindow.cxx +++ b/Common/Core/vtkFileOutputWindow.cxx @@ -16,6 +16,7 @@ #include "vtkObjectFactory.h" #include "vtksys/FStream.hxx" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkFileOutputWindow); vtkFileOutputWindow::vtkFileOutputWindow() @@ -73,3 +74,4 @@ void vtkFileOutputWindow::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Append: " << (this->Append ? "On" : "Off") << endl; os << indent << "Flush: " << (this->Flush ? "On" : "Off") << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkFileOutputWindow.h b/Common/Core/vtkFileOutputWindow.h index 0aa41f6967..8207c9dfcc 100644 --- a/Common/Core/vtkFileOutputWindow.h +++ b/Common/Core/vtkFileOutputWindow.h @@ -27,6 +27,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkOutputWindow.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkFileOutputWindow : public vtkOutputWindow { public: @@ -87,4 +88,5 @@ private: void operator=(const vtkFileOutputWindow&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkFloatArray.cxx b/Common/Core/vtkFloatArray.cxx index fbfda62664..0a52b5e1a8 100644 --- a/Common/Core/vtkFloatArray.cxx +++ b/Common/Core/vtkFloatArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(float); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkFloatArray); vtkStandardExtendedNewMacro(vtkFloatArray); @@ -36,3 +37,4 @@ void vtkFloatArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkFloatArray.h b/Common/Core/vtkFloatArray.h index 76028de7bf..4304a22b22 100644 --- a/Common/Core/vtkFloatArray.h +++ b/Common/Core/vtkFloatArray.h @@ -32,6 +32,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkFloatArray : public vtkDataArray { public: @@ -83,4 +84,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkFloatArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkFloatingPointExceptions.cxx b/Common/Core/vtkFloatingPointExceptions.cxx index b3f45d87c0..d76768030b 100644 --- a/Common/Core/vtkFloatingPointExceptions.cxx +++ b/Common/Core/vtkFloatingPointExceptions.cxx @@ -47,6 +47,7 @@ void signal_handler(int signal) //------------------------------------------------------------------------------ // Description: // Enable floating point exceptions. +VTK_ABI_NAMESPACE_BEGIN void vtkFloatingPointExceptions::Enable() { #ifdef _MSC_VER @@ -76,3 +77,4 @@ void vtkFloatingPointExceptions::Disable() fedisableexcept(FE_DIVBYZERO | FE_INVALID); #endif } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkFloatingPointExceptions.h b/Common/Core/vtkFloatingPointExceptions.h index 50957f37dd..5a39b14484 100644 --- a/Common/Core/vtkFloatingPointExceptions.h +++ b/Common/Core/vtkFloatingPointExceptions.h @@ -29,6 +29,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkSystemIncludes.h" // For VTKCOMMONCORE_EXPORT +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkFloatingPointExceptions { public: @@ -48,5 +49,6 @@ private: void operator=(const vtkFloatingPointExceptions&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkFloatingPointExceptions.h diff --git a/Common/Core/vtkGarbageCollector.cxx b/Common/Core/vtkGarbageCollector.cxx index c65a320d69..87d0a088ec 100644 --- a/Common/Core/vtkGarbageCollector.cxx +++ b/Common/Core/vtkGarbageCollector.cxx @@ -36,6 +36,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkGarbageCollector); #if VTK_GARBAGE_COLLECTOR_HASH @@ -1065,3 +1066,4 @@ void vtkGarbageCollectorReport( { ptr.Report(collector, desc); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkGarbageCollector.h b/Common/Core/vtkGarbageCollector.h index d8b0b345ee..48dfedf956 100644 --- a/Common/Core/vtkGarbageCollector.h +++ b/Common/Core/vtkGarbageCollector.h @@ -78,6 +78,7 @@ // This function is a friend of the collector so that it can call the // internal report method. +VTK_ABI_NAMESPACE_BEGIN void VTKCOMMONCORE_EXPORT vtkGarbageCollectorReportInternal( vtkGarbageCollector*, vtkObjectBase*, void*, const char*); @@ -199,4 +200,5 @@ void vtkGarbageCollectorReport(vtkGarbageCollector* collector, T*& ptr, const ch vtkGarbageCollectorReportInternal(collector, ptr, &ptr, desc); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkGarbageCollectorManager.cxx b/Common/Core/vtkGarbageCollectorManager.cxx index 9776b2ea4e..5e63ee4f20 100644 --- a/Common/Core/vtkGarbageCollectorManager.cxx +++ b/Common/Core/vtkGarbageCollectorManager.cxx @@ -18,6 +18,7 @@ // Must NOT be initialized. Default initialization to zero is // necessary. +VTK_ABI_NAMESPACE_BEGIN static unsigned int vtkGarbageCollectorManagerCount; vtkGarbageCollectorManager::vtkGarbageCollectorManager() @@ -35,3 +36,4 @@ vtkGarbageCollectorManager::~vtkGarbageCollectorManager() vtkGarbageCollector::ClassFinalize(); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkGarbageCollectorManager.h b/Common/Core/vtkGarbageCollectorManager.h index 8ebe5ba628..9b0af9e5a0 100644 --- a/Common/Core/vtkGarbageCollectorManager.h +++ b/Common/Core/vtkGarbageCollectorManager.h @@ -31,6 +31,7 @@ #include "vtkDebugLeaksManager.h" // DebugLeaks is around longer than // the garbage collector. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkGarbageCollectorManager { public: @@ -48,5 +49,6 @@ private: // it is done being used. static vtkGarbageCollectorManager vtkGarbageCollectorManagerInstance; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkGarbageCollectorManager.h diff --git a/Common/Core/vtkGaussianRandomSequence.cxx b/Common/Core/vtkGaussianRandomSequence.cxx index 2097b2665c..c16c4f4ca5 100644 --- a/Common/Core/vtkGaussianRandomSequence.cxx +++ b/Common/Core/vtkGaussianRandomSequence.cxx @@ -14,6 +14,7 @@ #include "vtkGaussianRandomSequence.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkGaussianRandomSequence::vtkGaussianRandomSequence() = default; //------------------------------------------------------------------------------ @@ -37,3 +38,4 @@ void vtkGaussianRandomSequence::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkGaussianRandomSequence.h b/Common/Core/vtkGaussianRandomSequence.h index b821954dee..7a19c5555b 100644 --- a/Common/Core/vtkGaussianRandomSequence.h +++ b/Common/Core/vtkGaussianRandomSequence.h @@ -28,6 +28,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkRandomSequence.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkGaussianRandomSequence : public vtkRandomSequence { public: @@ -64,4 +65,5 @@ private: void operator=(const vtkGaussianRandomSequence&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // #ifndef vtkGaussianRandomSequence_h diff --git a/Common/Core/vtkGenericDataArray.cxx b/Common/Core/vtkGenericDataArray.cxx index 4f2ff0d99c..9eb1f0d06a 100644 --- a/Common/Core/vtkGenericDataArray.cxx +++ b/Common/Core/vtkGenericDataArray.cxx @@ -25,5 +25,7 @@ namespace vtkDataArrayPrivate { +VTK_ABI_NAMESPACE_BEGIN VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(vtkDataArray, double) +VTK_ABI_NAMESPACE_END } // namespace vtkDataArrayPrivate diff --git a/Common/Core/vtkGenericDataArray.h b/Common/Core/vtkGenericDataArray.h index 7842b1b4e6..1aa0f4aa3a 100644 --- a/Common/Core/vtkGenericDataArray.h +++ b/Common/Core/vtkGenericDataArray.h @@ -75,6 +75,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN template class vtkGenericDataArray : public vtkDataArray { @@ -426,10 +427,12 @@ private: vtkGenericDataArray(const vtkGenericDataArray&) = delete; void operator=(const vtkGenericDataArray&) = delete; }; +VTK_ABI_NAMESPACE_END // these predeclarations are needed before the .txx include for MinGW namespace vtkDataArrayPrivate { +VTK_ABI_NAMESPACE_BEGIN template bool DoComputeScalarRange(A*, R*, T, const unsigned char* ghosts, unsigned char ghostsToSkip); template @@ -438,6 +441,7 @@ bool DoComputeVectorRange( template bool DoComputeVectorRange( A*, R[2], FiniteValues, const unsigned char* ghosts, unsigned char ghostsToSkip); +VTK_ABI_NAMESPACE_END } // namespace vtkDataArrayPrivate #include "vtkGenericDataArray.txx" @@ -475,6 +479,7 @@ public: #ifdef VTK_GDA_VALUERANGE_INSTANTIATING // Forward declare necessary stuffs: +VTK_ABI_NAMESPACE_BEGIN template class vtkAOSDataArrayTemplate; template @@ -484,6 +489,7 @@ class vtkSOADataArrayTemplate; template class vtkScaledSOADataArrayTemplate; #endif +VTK_ABI_NAMESPACE_END #define VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \ template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ @@ -521,6 +527,7 @@ class vtkScaledSOADataArrayTemplate; #pragma warning(disable : 4910) // extern and dllexport incompatible #endif +VTK_ABI_NAMESPACE_BEGIN // Forward declare necessary stuffs: template class vtkAOSDataArrayTemplate; @@ -531,9 +538,11 @@ class vtkSOADataArrayTemplate; template class vtkScaledSOADataArrayTemplate; #endif +VTK_ABI_NAMESPACE_END namespace vtkDataArrayPrivate { +VTK_ABI_NAMESPACE_BEGIN template bool DoComputeScalarRange(A*, R*, T, const unsigned char* ghosts, unsigned char ghostsToSkip); template @@ -542,6 +551,7 @@ bool DoComputeVectorRange( template bool DoComputeVectorRange( A*, R[2], FiniteValues, const unsigned char* ghosts, unsigned char ghostsToSkip); +VTK_ABI_NAMESPACE_END } // namespace vtkDataArrayPrivate #define VTK_DECLARE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \ @@ -571,6 +581,7 @@ bool DoComputeVectorRange( namespace vtkDataArrayPrivate { +VTK_ABI_NAMESPACE_BEGIN // These are instantiated in vtkGenericDataArrayValueRange${i}.cxx VTK_DECLARE_VALUERANGE_VALUETYPE(long) VTK_DECLARE_VALUERANGE_VALUETYPE(unsigned long) @@ -627,6 +638,7 @@ VTK_DECLARE_VALUERANGE_ARRAYTYPE(vtkScaledSOADataArrayTemplate, doubl VTK_DECLARE_VALUERANGE_ARRAYTYPE(vtkScaledSOADataArrayTemplate, double) #endif // VTK_USE_SCALED_SOA_ARRAYS +VTK_ABI_NAMESPACE_END } // namespace vtkDataArrayPrivate #undef VTK_DECLARE_VALUERANGE_ARRAYTYPE diff --git a/Common/Core/vtkGenericDataArray.txx b/Common/Core/vtkGenericDataArray.txx index c64752c46c..bcd9381f2e 100644 --- a/Common/Core/vtkGenericDataArray.txx +++ b/Common/Core/vtkGenericDataArray.txx @@ -22,6 +22,7 @@ #include "vtkVariantCast.h" //----------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN template double* vtkGenericDataArray::GetTuple(vtkIdType tupleIdx) { @@ -1034,9 +1035,11 @@ class vtkSOADataArrayTemplate; template class vtkScaledSOADataArrayTemplate; #endif +VTK_ABI_NAMESPACE_END namespace vtk_GDA_detail { +VTK_ABI_NAMESPACE_BEGIN // Arrays templates with compiled-in support for value ranges in // vtkGenericDataArray.cxx @@ -1094,8 +1097,10 @@ struct IsSupported { }; +VTK_ABI_NAMESPACE_END } // end namespace vtk_GDA_detail +VTK_ABI_NAMESPACE_BEGIN //----------------------------------------------------------------------------- template void vtkGenericDataArray::ComputeValueRange( @@ -1219,9 +1224,11 @@ void vtkGenericDataArray::ComputeFiniteValueRange( } } } +VTK_ABI_NAMESPACE_END namespace vtk_GDA_detail { +VTK_ABI_NAMESPACE_BEGIN template bool ComputeScalarValueRangeImpl(ArrayType* array, ValueType* range, Tag tag, std::true_type, @@ -1276,8 +1283,10 @@ bool ComputeVectorValueRangeImpl(ArrayType* array, ValueType range[2], Tag tag, return true; } +VTK_ABI_NAMESPACE_END } // namespace vtk_GDA_detail +VTK_ABI_NAMESPACE_BEGIN //----------------------------------------------------------------------------- template bool vtkGenericDataArray::ComputeScalarValueRange( @@ -1324,4 +1333,5 @@ bool vtkGenericDataArray::ComputeFiniteVectorValueRange( #undef vtkGenericDataArrayT +VTK_ABI_NAMESPACE_END #endif // header guard diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h b/Common/Core/vtkGenericDataArrayLookupHelper.h index f8564ccd74..492bbd955e 100644 --- a/Common/Core/vtkGenericDataArrayLookupHelper.h +++ b/Common/Core/vtkGenericDataArrayLookupHelper.h @@ -31,6 +31,7 @@ namespace detail { +VTK_ABI_NAMESPACE_BEGIN template struct has_NaN; @@ -52,8 +53,10 @@ bool isnan(T x) // Select the correct partially specialized type. return has_NaN::has_quiet_NaN>::isnan(x); } +VTK_ABI_NAMESPACE_END } // namespace detail +VTK_ABI_NAMESPACE_BEGIN template class vtkGenericDataArrayLookupHelper { @@ -128,7 +131,7 @@ private: for (vtkIdType i = 0; i < num; ++i) { auto value = this->AssociatedArray->GetValue(i); - if (::detail::isnan(value)) + if (detail::isnan(value)) { NanIndices.push_back(i); } @@ -141,7 +144,7 @@ private: std::vector* FindIndexVec(ValueType value) { std::vector* indices{ nullptr }; - if (::detail::isnan(value) && !this->NanIndices.empty()) + if (detail::isnan(value) && !this->NanIndices.empty()) { indices = &this->NanIndices; } @@ -158,5 +161,6 @@ private: std::vector NanIndices; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkGenericDataArrayLookupHelper.h diff --git a/Common/Core/vtkGenericDataArrayValueRangeInstantiate.cxx.in b/Common/Core/vtkGenericDataArrayValueRangeInstantiate.cxx.in index a743698cca..f939cf77e6 100644 --- a/Common/Core/vtkGenericDataArrayValueRangeInstantiate.cxx.in +++ b/Common/Core/vtkGenericDataArrayValueRangeInstantiate.cxx.in @@ -32,5 +32,7 @@ namespace vtkDataArrayPrivate { +VTK_ABI_NAMESPACE_BEGIN VTK_INSTANTIATE_VALUERANGE_VALUETYPE(@INSTANTIATION_VALUE_TYPE@) +VTK_ABI_NAMESPACE_END } diff --git a/Common/Core/vtkIdList.cxx b/Common/Core/vtkIdList.cxx index c16c19c034..d9e31ceee2 100644 --- a/Common/Core/vtkIdList.cxx +++ b/Common/Core/vtkIdList.cxx @@ -16,6 +16,7 @@ #include "vtkObjectFactory.h" #include "vtkSMPTools.h" //for parallel sort +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkIdList); //------------------------------------------------------------------------------ @@ -301,3 +302,4 @@ void vtkIdList::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Number of Ids: " << this->NumberOfIds << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkIdList.h b/Common/Core/vtkIdList.h index 99bda48677..e0ece29505 100644 --- a/Common/Core/vtkIdList.h +++ b/Common/Core/vtkIdList.h @@ -27,6 +27,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkIdList : public vtkObject { public: @@ -251,4 +252,5 @@ inline vtkIdType vtkIdList::IsId(vtkIdType vtkid) return (-1); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkIdListCollection.cxx b/Common/Core/vtkIdListCollection.cxx index 750490297d..f73703115c 100644 --- a/Common/Core/vtkIdListCollection.cxx +++ b/Common/Core/vtkIdListCollection.cxx @@ -15,9 +15,11 @@ #include "vtkIdListCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkIdListCollection); void vtkIdListCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkIdListCollection.h b/Common/Core/vtkIdListCollection.h index 5fa4482e18..f02b4260a2 100644 --- a/Common/Core/vtkIdListCollection.h +++ b/Common/Core/vtkIdListCollection.h @@ -28,6 +28,7 @@ #include "vtkIdList.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkIdListCollection : public vtkCollection { public: @@ -72,4 +73,5 @@ private: void operator=(const vtkIdListCollection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkIdTypeArray.cxx b/Common/Core/vtkIdTypeArray.cxx index 778a4bf6cf..2264dbe5e7 100644 --- a/Common/Core/vtkIdTypeArray.cxx +++ b/Common/Core/vtkIdTypeArray.cxx @@ -25,6 +25,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkIdTypeArray); vtkStandardExtendedNewMacro(vtkIdTypeArray); @@ -39,3 +40,4 @@ void vtkIdTypeArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkIdTypeArray.h b/Common/Core/vtkIdTypeArray.h index af04024807..7c3fac5dae 100644 --- a/Common/Core/vtkIdTypeArray.h +++ b/Common/Core/vtkIdTypeArray.h @@ -32,6 +32,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkIdTypeArray : public vtkDataArray { public: @@ -96,4 +97,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkIdTypeArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkIndent.cxx b/Common/Core/vtkIndent.cxx index 741d09d71a..18dd0d0dcd 100644 --- a/Common/Core/vtkIndent.cxx +++ b/Common/Core/vtkIndent.cxx @@ -16,6 +16,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkIndent* vtkIndent::New() { return new vtkIndent; // not a VTK object, don't use object factory macros @@ -44,3 +45,4 @@ ostream& operator<<(ostream& os, const vtkIndent& ind) os << blanks + (VTK_NUMBER_OF_BLANKS - ind.Indent); return os; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkIndent.h b/Common/Core/vtkIndent.h index 1f3a80c04a..12a0d9d293 100644 --- a/Common/Core/vtkIndent.h +++ b/Common/Core/vtkIndent.h @@ -27,6 +27,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIndent; VTKCOMMONCORE_EXPORT ostream& operator<<(ostream& os, const vtkIndent& o); @@ -52,5 +53,6 @@ protected: int Indent; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkIndent.h diff --git a/Common/Core/vtkInformation.cxx b/Common/Core/vtkInformation.cxx index 216b2c580c..bb6e1601ac 100644 --- a/Common/Core/vtkInformation.cxx +++ b/Common/Core/vtkInformation.cxx @@ -45,6 +45,7 @@ #include "vtkInformationInternals.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkInformation); //------------------------------------------------------------------------------ @@ -955,3 +956,4 @@ vtkInformationRequestKey* vtkInformation::GetRequest() { return this->Request; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformation.h b/Common/Core/vtkInformation.h index 2792fe4a0c..e429caa0d3 100644 --- a/Common/Core/vtkInformation.h +++ b/Common/Core/vtkInformation.h @@ -33,6 +33,7 @@ #include // for std::string compat +VTK_ABI_NAMESPACE_BEGIN class vtkDataObject; class vtkExecutive; class vtkInformationDataObjectKey; @@ -463,4 +464,5 @@ private: vtkInformationRequestKey* Request; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationDataObjectKey.cxx b/Common/Core/vtkInformationDataObjectKey.cxx index d0cb7717ad..bf1b406ec6 100644 --- a/Common/Core/vtkInformationDataObjectKey.cxx +++ b/Common/Core/vtkInformationDataObjectKey.cxx @@ -19,6 +19,7 @@ #endif //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationDataObjectKey::vtkInformationDataObjectKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -63,3 +64,4 @@ void vtkInformationDataObjectKey::Report(vtkInformation* info, vtkGarbageCollect { this->ReportAsObjectBase(info, collector); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationDataObjectKey.h b/Common/Core/vtkInformationDataObjectKey.h index e7aefe8438..649cf8c588 100644 --- a/Common/Core/vtkInformationDataObjectKey.h +++ b/Common/Core/vtkInformationDataObjectKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class vtkDataObject; class VTKCOMMONCORE_EXPORT vtkInformationDataObjectKey : public vtkInformationKey @@ -76,4 +77,5 @@ private: void operator=(const vtkInformationDataObjectKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationDoubleKey.cxx b/Common/Core/vtkInformationDoubleKey.cxx index 1ac33e1938..90fa0a10d1 100644 --- a/Common/Core/vtkInformationDoubleKey.cxx +++ b/Common/Core/vtkInformationDoubleKey.cxx @@ -17,6 +17,7 @@ #include "vtkInformation.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationDoubleKey::vtkInformationDoubleKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -108,3 +109,4 @@ double* vtkInformationDoubleKey::GetWatchAddress(vtkInformation* info) } return nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationDoubleKey.h b/Common/Core/vtkInformationDoubleKey.h index 3689a45a28..c86a2e8fd7 100644 --- a/Common/Core/vtkInformationDoubleKey.h +++ b/Common/Core/vtkInformationDoubleKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationDoubleKey : public vtkInformationKey { public: @@ -81,4 +82,5 @@ private: void operator=(const vtkInformationDoubleKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationDoubleVectorKey.cxx b/Common/Core/vtkInformationDoubleVectorKey.cxx index df0398f07a..85df56a44a 100644 --- a/Common/Core/vtkInformationDoubleVectorKey.cxx +++ b/Common/Core/vtkInformationDoubleVectorKey.cxx @@ -19,6 +19,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationDoubleVectorKey ::vtkInformationDoubleVectorKey( const char* name, const char* location, int length) : vtkInformationKey(name, location) @@ -151,3 +152,4 @@ void vtkInformationDoubleVectorKey::Print(ostream& os, vtkInformation* info) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationDoubleVectorKey.h b/Common/Core/vtkInformationDoubleVectorKey.h index 512b1c7304..0642e2fb89 100644 --- a/Common/Core/vtkInformationDoubleVectorKey.h +++ b/Common/Core/vtkInformationDoubleVectorKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationDoubleVectorKey : public vtkInformationKey { public: @@ -82,4 +83,5 @@ private: void operator=(const vtkInformationDoubleVectorKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationIdTypeKey.cxx b/Common/Core/vtkInformationIdTypeKey.cxx index bbcf890a1d..99c33ee508 100644 --- a/Common/Core/vtkInformationIdTypeKey.cxx +++ b/Common/Core/vtkInformationIdTypeKey.cxx @@ -17,6 +17,7 @@ #include "vtkInformation.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationIdTypeKey::vtkInformationIdTypeKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -108,3 +109,4 @@ vtkIdType* vtkInformationIdTypeKey::GetWatchAddress(vtkInformation* info) } return nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationIdTypeKey.h b/Common/Core/vtkInformationIdTypeKey.h index 84d1c1e669..2fcbd450eb 100644 --- a/Common/Core/vtkInformationIdTypeKey.h +++ b/Common/Core/vtkInformationIdTypeKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationIdTypeKey : public vtkInformationKey { public: @@ -81,4 +82,5 @@ private: void operator=(const vtkInformationIdTypeKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationInformationKey.cxx b/Common/Core/vtkInformationInformationKey.cxx index 69dd051b65..c60f3b0adb 100644 --- a/Common/Core/vtkInformationInformationKey.cxx +++ b/Common/Core/vtkInformationInformationKey.cxx @@ -17,6 +17,7 @@ #include "vtkInformation.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationInformationKey::vtkInformationInformationKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -58,3 +59,4 @@ void vtkInformationInformationKey::DeepCopy(vtkInformation* from, vtkInformation this->Set(to, toInfo); toInfo->Delete(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationInformationKey.h b/Common/Core/vtkInformationInformationKey.h index ff8688fe18..903e38b1ee 100644 --- a/Common/Core/vtkInformationInformationKey.h +++ b/Common/Core/vtkInformationInformationKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationInformationKey : public vtkInformationKey { public: @@ -76,4 +77,5 @@ private: void operator=(const vtkInformationInformationKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationInformationVectorKey.cxx b/Common/Core/vtkInformationInformationVectorKey.cxx index bb328fbb62..2c068bd4bd 100644 --- a/Common/Core/vtkInformationInformationVectorKey.cxx +++ b/Common/Core/vtkInformationInformationVectorKey.cxx @@ -18,6 +18,7 @@ #include "vtkInformationVector.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationInformationVectorKey::vtkInformationInformationVectorKey( const char* name, const char* location) : vtkInformationKey(name, location) @@ -77,3 +78,4 @@ void vtkInformationInformationVectorKey::Report( { this->ReportAsObjectBase(info, collector); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationInformationVectorKey.h b/Common/Core/vtkInformationInformationVectorKey.h index 03738a1e5e..885066a9ae 100644 --- a/Common/Core/vtkInformationInformationVectorKey.h +++ b/Common/Core/vtkInformationInformationVectorKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class vtkInformationVector; class VTKCOMMONCORE_EXPORT vtkInformationInformationVectorKey : public vtkInformationKey @@ -72,4 +73,5 @@ private: void operator=(const vtkInformationInformationVectorKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationIntegerKey.cxx b/Common/Core/vtkInformationIntegerKey.cxx index 5f109decc9..d041b6c21c 100644 --- a/Common/Core/vtkInformationIntegerKey.cxx +++ b/Common/Core/vtkInformationIntegerKey.cxx @@ -17,6 +17,7 @@ #include "vtkInformation.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationIntegerKey::vtkInformationIntegerKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -108,3 +109,4 @@ int* vtkInformationIntegerKey::GetWatchAddress(vtkInformation* info) } return nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationIntegerKey.h b/Common/Core/vtkInformationIntegerKey.h index def6e6146d..e4c53e494c 100644 --- a/Common/Core/vtkInformationIntegerKey.h +++ b/Common/Core/vtkInformationIntegerKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationIntegerKey : public vtkInformationKey { public: @@ -81,4 +82,5 @@ private: void operator=(const vtkInformationIntegerKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationIntegerPointerKey.cxx b/Common/Core/vtkInformationIntegerPointerKey.cxx index 0c5ee98fb0..b0f3d1d84d 100644 --- a/Common/Core/vtkInformationIntegerPointerKey.cxx +++ b/Common/Core/vtkInformationIntegerPointerKey.cxx @@ -20,6 +20,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationIntegerPointerKey ::vtkInformationIntegerPointerKey( const char* name, const char* location, int length) : vtkInformationKey(name, location) @@ -136,3 +137,4 @@ int* vtkInformationIntegerPointerKey::GetWatchAddress(vtkInformation* info) } return nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationIntegerPointerKey.h b/Common/Core/vtkInformationIntegerPointerKey.h index f1cdd14da5..cfb79fe557 100644 --- a/Common/Core/vtkInformationIntegerPointerKey.h +++ b/Common/Core/vtkInformationIntegerPointerKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationIntegerPointerKey : public vtkInformationKey { public: @@ -76,4 +77,5 @@ private: void operator=(const vtkInformationIntegerPointerKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationIntegerVectorKey.cxx b/Common/Core/vtkInformationIntegerVectorKey.cxx index a8466ba5a8..63c2b3a4a9 100644 --- a/Common/Core/vtkInformationIntegerVectorKey.cxx +++ b/Common/Core/vtkInformationIntegerVectorKey.cxx @@ -20,6 +20,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationIntegerVectorKey ::vtkInformationIntegerVectorKey( const char* name, const char* location, int length) : vtkInformationKey(name, location) @@ -183,3 +184,4 @@ int* vtkInformationIntegerVectorKey::GetWatchAddress(vtkInformation* info) static_cast(this->GetAsObjectBase(info)); return (v && !v->Value.empty()) ? v->Value.data() : nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationIntegerVectorKey.h b/Common/Core/vtkInformationIntegerVectorKey.h index 3401b3f6ad..2e01f78c67 100644 --- a/Common/Core/vtkInformationIntegerVectorKey.h +++ b/Common/Core/vtkInformationIntegerVectorKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationIntegerVectorKey : public vtkInformationKey { public: @@ -90,4 +91,5 @@ private: void operator=(const vtkInformationIntegerVectorKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationInternals.h b/Common/Core/vtkInformationInternals.h index abe9b71a2d..c1d0c56e13 100644 --- a/Common/Core/vtkInformationInternals.h +++ b/Common/Core/vtkInformationInternals.h @@ -36,6 +36,7 @@ #endif //---------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN class vtkInformationInternals { public: @@ -79,5 +80,6 @@ private: #undef VTK_INFORMATION_USE_HASH_MAP +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkInformationInternals.h diff --git a/Common/Core/vtkInformationIterator.cxx b/Common/Core/vtkInformationIterator.cxx index fb7d6a8bc2..fadcafc8f0 100644 --- a/Common/Core/vtkInformationIterator.cxx +++ b/Common/Core/vtkInformationIterator.cxx @@ -19,6 +19,7 @@ #include "vtkInformationKey.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkInformationIterator); class vtkInformationIteratorInternals @@ -143,3 +144,4 @@ void vtkInformationIterator::PrintSelf(ostream& os, vtkIndent indent) os << "(none)" << endl; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationIterator.h b/Common/Core/vtkInformationIterator.h index 3927cc16ad..78a4f9696c 100644 --- a/Common/Core/vtkInformationIterator.h +++ b/Common/Core/vtkInformationIterator.h @@ -30,6 +30,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformation; class vtkInformationKey; class vtkInformationIteratorInternals; @@ -98,4 +99,5 @@ private: void operator=(const vtkInformationIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationKey.cxx b/Common/Core/vtkInformationKey.cxx index e6498550a5..929b49dccd 100644 --- a/Common/Core/vtkInformationKey.cxx +++ b/Common/Core/vtkInformationKey.cxx @@ -18,6 +18,7 @@ #include "vtkDebugLeaks.h" #include "vtkInformation.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformationKeyToInformationFriendship { public: @@ -147,3 +148,4 @@ void vtkInformationKey::ReportAsObjectBase(vtkInformation* info, vtkGarbageColle //------------------------------------------------------------------------------ void vtkInformationKey::ConstructClass(const char*) {} +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationKey.h b/Common/Core/vtkInformationKey.h index 3491376f7b..b928e1acaa 100644 --- a/Common/Core/vtkInformationKey.h +++ b/Common/Core/vtkInformationKey.h @@ -33,6 +33,7 @@ #include "vtkObject.h" // Need vtkTypeMacro #include "vtkObjectBase.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformation; class VTKCOMMONCORE_EXPORT vtkInformationKey : public vtkObjectBase @@ -228,4 +229,5 @@ private: new vtkInformation##type##Key(#NAME, #CLASS, required); \ vtkInformation##type##Key* CLASS::NAME() { return CLASS##_##NAME; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationKeyLookup.cxx b/Common/Core/vtkInformationKeyLookup.cxx index 5e8b36fe46..0913c169a5 100644 --- a/Common/Core/vtkInformationKeyLookup.cxx +++ b/Common/Core/vtkInformationKeyLookup.cxx @@ -18,6 +18,7 @@ #include "vtkInformationKey.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkInformationKeyLookup); //------------------------------------------------------------------------------ @@ -65,3 +66,4 @@ vtkInformationKeyLookup::KeyMap& vtkInformationKeyLookup::Keys() static vtkInformationKeyLookup::KeyMap keys; return keys; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationKeyLookup.h b/Common/Core/vtkInformationKeyLookup.h index a876af02a7..c3c842725b 100644 --- a/Common/Core/vtkInformationKeyLookup.h +++ b/Common/Core/vtkInformationKeyLookup.h @@ -29,6 +29,7 @@ #include // For std::string #include // For std::pair +VTK_ABI_NAMESPACE_BEGIN class vtkInformationKey; class VTKCOMMONCORE_EXPORT vtkInformationKeyLookup : public vtkObject @@ -75,4 +76,5 @@ private: static KeyMap& Keys(); }; +VTK_ABI_NAMESPACE_END #endif // vtkInformationKeyLookup_h diff --git a/Common/Core/vtkInformationKeyVectorKey.cxx b/Common/Core/vtkInformationKeyVectorKey.cxx index 334242193a..fa9d64d5a7 100644 --- a/Common/Core/vtkInformationKeyVectorKey.cxx +++ b/Common/Core/vtkInformationKeyVectorKey.cxx @@ -19,6 +19,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationKeyVectorKey::vtkInformationKeyVectorKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -185,3 +186,4 @@ void vtkInformationKeyVectorKey::Print(ostream& os, vtkInformation* info) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationKeyVectorKey.h b/Common/Core/vtkInformationKeyVectorKey.h index 5749898513..db2faad5b0 100644 --- a/Common/Core/vtkInformationKeyVectorKey.h +++ b/Common/Core/vtkInformationKeyVectorKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationKeyVectorKey : public vtkInformationKey { public: @@ -79,4 +80,5 @@ private: void operator=(const vtkInformationKeyVectorKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationObjectBaseKey.cxx b/Common/Core/vtkInformationObjectBaseKey.cxx index 33ee605438..c76d778498 100644 --- a/Common/Core/vtkInformationObjectBaseKey.cxx +++ b/Common/Core/vtkInformationObjectBaseKey.cxx @@ -17,6 +17,7 @@ #include "vtkInformation.h" // For vtkErrorWithObjectMacro //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationObjectBaseKey ::vtkInformationObjectBaseKey( const char* name, const char* location, const char* requiredClass) : vtkInformationKey(name, location) @@ -71,3 +72,4 @@ void vtkInformationObjectBaseKey::Report(vtkInformation* info, vtkGarbageCollect { this->ReportAsObjectBase(info, collector); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationObjectBaseKey.h b/Common/Core/vtkInformationObjectBaseKey.h index 1d610ac28f..7740285276 100644 --- a/Common/Core/vtkInformationObjectBaseKey.h +++ b/Common/Core/vtkInformationObjectBaseKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class vtkObjectBase; class VTKCOMMONCORE_EXPORT vtkInformationObjectBaseKey : public vtkInformationKey @@ -84,4 +85,5 @@ private: void operator=(const vtkInformationObjectBaseKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationObjectBaseVectorKey.cxx b/Common/Core/vtkInformationObjectBaseVectorKey.cxx index 1bfff7a2be..0777e1cf9d 100644 --- a/Common/Core/vtkInformationObjectBaseVectorKey.cxx +++ b/Common/Core/vtkInformationObjectBaseVectorKey.cxx @@ -19,6 +19,7 @@ #include //============================================================================ +VTK_ABI_NAMESPACE_BEGIN class vtkInformationObjectBaseVectorValue : public vtkObjectBase { public: @@ -327,3 +328,4 @@ void vtkInformationObjectBaseVectorKey::Print(ostream& os, vtkInformation* info) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationObjectBaseVectorKey.h b/Common/Core/vtkInformationObjectBaseVectorKey.h index 5d83217687..f7a2323e1d 100644 --- a/Common/Core/vtkInformationObjectBaseVectorKey.h +++ b/Common/Core/vtkInformationObjectBaseVectorKey.h @@ -29,6 +29,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. #include "vtkInformationKey.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformationObjectBaseVectorValue; class VTKCOMMONCORE_EXPORT vtkInformationObjectBaseVectorKey : public vtkInformationKey @@ -165,4 +166,5 @@ private: void operator=(const vtkInformationObjectBaseVectorKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationRequestKey.cxx b/Common/Core/vtkInformationRequestKey.cxx index 955a474c79..ad21d8cdad 100644 --- a/Common/Core/vtkInformationRequestKey.cxx +++ b/Common/Core/vtkInformationRequestKey.cxx @@ -17,6 +17,7 @@ #include "vtkInformation.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationRequestKey::vtkInformationRequestKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -74,3 +75,4 @@ void vtkInformationRequestKey::Print(ostream& os, vtkInformation* info) os << "1\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationRequestKey.h b/Common/Core/vtkInformationRequestKey.h index 2b198fbdd5..abec426168 100644 --- a/Common/Core/vtkInformationRequestKey.h +++ b/Common/Core/vtkInformationRequestKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationRequestKey : public vtkInformationKey { public: @@ -74,4 +75,5 @@ private: void operator=(const vtkInformationRequestKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationStringKey.cxx b/Common/Core/vtkInformationStringKey.cxx index 8b83533118..2242697e1b 100644 --- a/Common/Core/vtkInformationStringKey.cxx +++ b/Common/Core/vtkInformationStringKey.cxx @@ -19,6 +19,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationStringKey::vtkInformationStringKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -105,3 +106,4 @@ void vtkInformationStringKey::Print(ostream& os, vtkInformation* info) os << this->Get(info); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationStringKey.h b/Common/Core/vtkInformationStringKey.h index 12e57c8baf..87d447a5c6 100644 --- a/Common/Core/vtkInformationStringKey.h +++ b/Common/Core/vtkInformationStringKey.h @@ -30,6 +30,7 @@ #include // for std::string compat +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationStringKey : public vtkInformationKey { public: @@ -76,4 +77,5 @@ private: void operator=(const vtkInformationStringKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationStringVectorKey.cxx b/Common/Core/vtkInformationStringVectorKey.cxx index d59b9ab97c..b4412590c3 100644 --- a/Common/Core/vtkInformationStringVectorKey.cxx +++ b/Common/Core/vtkInformationStringVectorKey.cxx @@ -20,6 +20,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationStringVectorKey ::vtkInformationStringVectorKey( const char* name, const char* location, int length) : vtkInformationKey(name, location) @@ -151,3 +152,4 @@ void vtkInformationStringVectorKey::Print(ostream& os, vtkInformation* info) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationStringVectorKey.h b/Common/Core/vtkInformationStringVectorKey.h index 5eddd04273..b1ef8628cc 100644 --- a/Common/Core/vtkInformationStringVectorKey.h +++ b/Common/Core/vtkInformationStringVectorKey.h @@ -30,6 +30,7 @@ #include // for std::string compat +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationStringVectorKey : public vtkInformationKey { public: @@ -84,4 +85,5 @@ private: void operator=(const vtkInformationStringVectorKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationUnsignedLongKey.cxx b/Common/Core/vtkInformationUnsignedLongKey.cxx index 5833d7acf8..c61dd7bde9 100644 --- a/Common/Core/vtkInformationUnsignedLongKey.cxx +++ b/Common/Core/vtkInformationUnsignedLongKey.cxx @@ -17,6 +17,7 @@ #include "vtkInformation.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationUnsignedLongKey::vtkInformationUnsignedLongKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -108,3 +109,4 @@ unsigned long* vtkInformationUnsignedLongKey::GetWatchAddress(vtkInformation* in } return nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationUnsignedLongKey.h b/Common/Core/vtkInformationUnsignedLongKey.h index 17687954e9..dc082a112f 100644 --- a/Common/Core/vtkInformationUnsignedLongKey.h +++ b/Common/Core/vtkInformationUnsignedLongKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkInformationUnsignedLongKey : public vtkInformationKey { public: @@ -82,4 +83,5 @@ private: void operator=(const vtkInformationUnsignedLongKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationVariantKey.cxx b/Common/Core/vtkInformationVariantKey.cxx index 2f5c7ce9ae..6a876ece89 100644 --- a/Common/Core/vtkInformationVariantKey.cxx +++ b/Common/Core/vtkInformationVariantKey.cxx @@ -18,6 +18,7 @@ #include "vtkVariant.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationVariantKey::vtkInformationVariantKey(const char* name, const char* location) : vtkInformationKey(name, location) { @@ -112,3 +113,4 @@ vtkVariant* vtkInformationVariantKey::GetWatchAddress(vtkInformation* info) } return nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationVariantKey.h b/Common/Core/vtkInformationVariantKey.h index 95f7c10122..2c0c703d28 100644 --- a/Common/Core/vtkInformationVariantKey.h +++ b/Common/Core/vtkInformationVariantKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class vtkVariant; class VTKCOMMONCORE_EXPORT vtkInformationVariantKey : public vtkInformationKey @@ -83,4 +84,5 @@ private: void operator=(const vtkInformationVariantKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationVariantVectorKey.cxx b/Common/Core/vtkInformationVariantVectorKey.cxx index 33d9de34b2..7fe1c14983 100644 --- a/Common/Core/vtkInformationVariantVectorKey.cxx +++ b/Common/Core/vtkInformationVariantVectorKey.cxx @@ -20,6 +20,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkInformationVariantVectorKey ::vtkInformationVariantVectorKey( const char* name, const char* location, int length) : vtkInformationKey(name, location) @@ -155,3 +156,4 @@ void vtkInformationVariantVectorKey::Print(ostream& os, vtkInformation* info) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationVariantVectorKey.h b/Common/Core/vtkInformationVariantVectorKey.h index 42951080b6..784df6925f 100644 --- a/Common/Core/vtkInformationVariantVectorKey.h +++ b/Common/Core/vtkInformationVariantVectorKey.h @@ -28,6 +28,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. +VTK_ABI_NAMESPACE_BEGIN class vtkVariant; class VTKCOMMONCORE_EXPORT vtkInformationVariantVectorKey : public vtkInformationKey @@ -84,4 +85,5 @@ private: void operator=(const vtkInformationVariantVectorKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkInformationVector.cxx b/Common/Core/vtkInformationVector.cxx index 2c7aec12b5..d088e14bce 100644 --- a/Common/Core/vtkInformationVector.cxx +++ b/Common/Core/vtkInformationVector.cxx @@ -20,6 +20,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkInformationVector); class vtkInformationVectorInternals @@ -227,3 +228,4 @@ void vtkInformationVector::ReportReferences(vtkGarbageCollector* collector) vtkGarbageCollectorReport(collector, this->Internal->Vector[i], "Entry"); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkInformationVector.h b/Common/Core/vtkInformationVector.h index 8733f36acd..496150d35a 100644 --- a/Common/Core/vtkInformationVector.h +++ b/Common/Core/vtkInformationVector.h @@ -29,6 +29,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformation; class vtkInformationVectorInternals; @@ -103,4 +104,5 @@ private: void operator=(const vtkInformationVector&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkIntArray.cxx b/Common/Core/vtkIntArray.cxx index 95f08b2164..140ec65d17 100644 --- a/Common/Core/vtkIntArray.cxx +++ b/Common/Core/vtkIntArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(int); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkIntArray); vtkStandardExtendedNewMacro(vtkIntArray); @@ -36,3 +37,4 @@ void vtkIntArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkIntArray.h b/Common/Core/vtkIntArray.h index 198a2c9b77..62bd0cdaed 100644 --- a/Common/Core/vtkIntArray.h +++ b/Common/Core/vtkIntArray.h @@ -36,6 +36,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkIntArray : public vtkDataArray { public: @@ -86,4 +87,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkIntArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkLargeInteger.cxx b/Common/Core/vtkLargeInteger.cxx index 20e287e1a9..dd0ae5e77c 100644 --- a/Common/Core/vtkLargeInteger.cxx +++ b/Common/Core/vtkLargeInteger.cxx @@ -21,6 +21,7 @@ #include "vtkLargeInteger.h" +VTK_ABI_NAMESPACE_BEGIN const unsigned int BIT_INCREMENT = 32; static int maximum(int a, int b) @@ -869,3 +870,4 @@ istream& operator>>(istream& s, vtkLargeInteger& n) } return s; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkLargeInteger.h b/Common/Core/vtkLargeInteger.h index 84f9632335..d69b6bc069 100644 --- a/Common/Core/vtkLargeInteger.h +++ b/Common/Core/vtkLargeInteger.h @@ -23,6 +23,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT VTK_WRAPEXCLUDE vtkLargeInteger { public: @@ -107,6 +108,7 @@ private: void Minus(const vtkLargeInteger& n); // unsigned }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkLargeInteger.h diff --git a/Common/Core/vtkLogger.cxx b/Common/Core/vtkLogger.cxx index b4799e4436..d5639965db 100644 --- a/Common/Core/vtkLogger.cxx +++ b/Common/Core/vtkLogger.cxx @@ -29,6 +29,7 @@ #include //============================================================================= +VTK_ABI_NAMESPACE_BEGIN class vtkLogger::LogScopeRAII::LSInternals { public: @@ -70,9 +71,11 @@ vtkLogger::LogScopeRAII::~LogScopeRAII() delete this->Internals; } //============================================================================= +VTK_ABI_NAMESPACE_END namespace detail { +VTK_ABI_NAMESPACE_BEGIN #if VTK_MODULE_ENABLE_VTK_loguru using scope_pair = std::pair>; static std::mutex g_mutex; @@ -109,8 +112,10 @@ static void pop_scope(const char* id) #endif static VTK_THREAD_LOCAL std::string ThreadName; +VTK_ABI_NAMESPACE_END } +VTK_ABI_NAMESPACE_BEGIN //============================================================================= bool vtkLogger::EnableUnsafeSignalHandler = true; vtkLogger::Verbosity vtkLogger::InternalVerbosityLevel = vtkLogger::VERBOSITY_1; @@ -446,3 +451,4 @@ vtkLogger::Verbosity vtkLogger::ConvertToVerbosity(const char* text) } return vtkLogger::VERBOSITY_INVALID; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkLogger.h b/Common/Core/vtkLogger.h index 80e50e20df..0f825aa890 100644 --- a/Common/Core/vtkLogger.h +++ b/Common/Core/vtkLogger.h @@ -174,6 +174,7 @@ #define VTK_FORMAT_STRING_TYPE const char* #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkLogger : public vtkObjectBase { public: @@ -548,4 +549,5 @@ private: */ #define vtkLogIdentifier(vtkobject) vtkLogger::GetIdentifier(vtkobject).c_str() +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkLongArray.cxx b/Common/Core/vtkLongArray.cxx index 547401b21c..98767af68c 100644 --- a/Common/Core/vtkLongArray.cxx +++ b/Common/Core/vtkLongArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(long); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLongArray); vtkStandardExtendedNewMacro(vtkLongArray); @@ -36,3 +37,4 @@ void vtkLongArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkLongArray.h b/Common/Core/vtkLongArray.h index e0412099fb..ba38db5e29 100644 --- a/Common/Core/vtkLongArray.h +++ b/Common/Core/vtkLongArray.h @@ -37,6 +37,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkLongArray : public vtkDataArray { public: @@ -87,4 +88,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkLongArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkLongLongArray.cxx b/Common/Core/vtkLongLongArray.cxx index 6d88f966c9..474c42c9e2 100644 --- a/Common/Core/vtkLongLongArray.cxx +++ b/Common/Core/vtkLongLongArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(long long); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLongLongArray); vtkStandardExtendedNewMacro(vtkLongLongArray); @@ -36,3 +37,4 @@ void vtkLongLongArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkLongLongArray.h b/Common/Core/vtkLongLongArray.h index 976c3fb997..5e2bbbdc5f 100644 --- a/Common/Core/vtkLongLongArray.h +++ b/Common/Core/vtkLongLongArray.h @@ -36,6 +36,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkLongLongArray : public vtkDataArray { public: @@ -86,4 +87,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkLongLongArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkLookupTable.cxx b/Common/Core/vtkLookupTable.cxx index e05cc02fbf..a445363be0 100644 --- a/Common/Core/vtkLookupTable.cxx +++ b/Common/Core/vtkLookupTable.cxx @@ -24,6 +24,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN const vtkIdType vtkLookupTable::REPEATED_LAST_COLOR_INDEX = 0; const vtkIdType vtkLookupTable::BELOW_RANGE_COLOR_INDEX = 1; const vtkIdType vtkLookupTable::ABOVE_RANGE_COLOR_INDEX = 2; @@ -424,6 +425,7 @@ double vtkLookupTable::GetOpacity(double v) return rgb8[3] / 255.0; } +VTK_ABI_NAMESPACE_END namespace { @@ -639,6 +641,7 @@ inline void vtkLookupShiftAndScale( } // end anonymous namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ void vtkLookupTable::GetLogRange(const double range[2], double log_range[2]) { @@ -798,6 +801,7 @@ const unsigned char* vtkLookupTable::MapValue(double v) return this->Table->GetPointer(0) + 4 * index; } +VTK_ABI_NAMESPACE_END namespace { @@ -1190,6 +1194,7 @@ void vtkLookupTableIndexedMapData(vtkLookupTable* self, const T* input, unsigned } // end anonymous namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ void vtkLookupTable::MapScalarsThroughTable2(void* input, unsigned char* output, int inputDataType, int numberOfValues, int inputIncrement, int outputFormat) @@ -1465,3 +1470,4 @@ void vtkLookupTable::ResizeTableForSpecialColors() this->Table->Resize(neededColors); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkLookupTable.h b/Common/Core/vtkLookupTable.h index f3d2d7ca9d..0445252e95 100644 --- a/Common/Core/vtkLookupTable.h +++ b/Common/Core/vtkLookupTable.h @@ -65,6 +65,7 @@ #define VTK_SCALE_LINEAR 0 #define VTK_SCALE_LOG10 1 +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkLookupTable : public vtkScalarsToColors { public: @@ -467,4 +468,5 @@ inline unsigned char* vtkLookupTable::WritePointer(vtkIdType id, int number) return this->Table->WritePointer(4 * id, 4 * number); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkMappedDataArray.h b/Common/Core/vtkMappedDataArray.h index 034556e86b..d3ee31a089 100644 --- a/Common/Core/vtkMappedDataArray.h +++ b/Common/Core/vtkMappedDataArray.h @@ -37,6 +37,7 @@ #include "vtkTypedDataArray.h" +VTK_ABI_NAMESPACE_BEGIN template class vtkMappedDataArray : public vtkTypedDataArray { @@ -143,6 +144,7 @@ private: // Declare vtkArrayDownCast implementations for mapped containers: vtkArrayDownCast_TemplateFastCastMacro(vtkMappedDataArray); +VTK_ABI_NAMESPACE_END #include "vtkMappedDataArray.txx" // Adds an implementation of NewInstanceInternal() that returns an AoS diff --git a/Common/Core/vtkMappedDataArray.txx b/Common/Core/vtkMappedDataArray.txx index 5504ee57c6..dabb2f3546 100644 --- a/Common/Core/vtkMappedDataArray.txx +++ b/Common/Core/vtkMappedDataArray.txx @@ -21,6 +21,7 @@ #include "vtkVariant.h" // for vtkVariant //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN template vtkMappedDataArray::vtkMappedDataArray() { @@ -173,4 +174,5 @@ void vtkMappedDataArray::Modified() this->TemporaryScalarPointerSize = 0; } +VTK_ABI_NAMESPACE_END #endif // vtkMappedDataArray_txx diff --git a/Common/Core/vtkMath.cxx b/Common/Core/vtkMath.cxx index 7aa5faeea1..08c6a34b04 100644 --- a/Common/Core/vtkMath.cxx +++ b/Common/Core/vtkMath.cxx @@ -36,6 +36,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMath); class vtkMathInternal : public vtkObjectBase @@ -3219,3 +3220,4 @@ int vtkMath::QuadraticRoot(double a, double b, double c, double min, double max, } return 0; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkMath.h b/Common/Core/vtkMath.h index 0f9f62fb1e..60531b3d44 100644 --- a/Common/Core/vtkMath.h +++ b/Common/Core/vtkMath.h @@ -71,19 +71,24 @@ #endif // DBL_EPSILON #endif // VTK_DBL_EPSILON +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkPoints; class vtkMathInternal; class vtkMinimalStandardRandomSequence; class vtkBoxMuellerRandomSequence; +VTK_ABI_NAMESPACE_END namespace vtk_detail { +VTK_ABI_NAMESPACE_BEGIN // forward declaration template void RoundDoubleToIntegralIfNecessary(double val, OutT* ret); +VTK_ABI_NAMESPACE_END } // end namespace vtk_detail +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkMath : public vtkObject { public: @@ -1932,6 +1937,7 @@ inline void vtkMath::TensorFromSymmetricTensor(T tensor[9]) tensor[2] = tensor[6]; // XZ tensor[1] = tensor[3]; // XY } +VTK_ABI_NAMESPACE_END namespace { @@ -1975,6 +1981,7 @@ inline void vtkQuaternionToMatrix3x3(const QuaternionT& quat, MatrixT& A) } } // anonymous namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ inline void vtkMath::QuaternionToMatrix3x3(const float quat[4], float A[3][3]) { @@ -1993,6 +2000,7 @@ inline void vtkMath::QuaternionToMatrix3x3(const QuaternionT& q, MatrixT&& A) { vtkQuaternionToMatrix3x3(q, A); } +VTK_ABI_NAMESPACE_END namespace { @@ -2049,6 +2057,7 @@ inline void vtkMatrix3x3ToQuaternion(const MatrixT& A, QuaternionT& quat) } } // anonymous namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ inline void vtkMath::Matrix3x3ToQuaternion(const float A[3][3], float quat[4]) { @@ -2067,9 +2076,11 @@ inline void vtkMath::Matrix3x3ToQuaternion(const MatrixT& A, QuaternionT&& q) { vtkMatrix3x3ToQuaternion(A, q); } +VTK_ABI_NAMESPACE_END namespace vtk_detail { +VTK_ABI_NAMESPACE_BEGIN // Can't specialize templates inside a template class, so we move the impl here. template void RoundDoubleToIntegralIfNecessary(double val, OutT* ret) @@ -2101,8 +2112,10 @@ inline void RoundDoubleToIntegralIfNecessary(double val, float* retVal) *retVal = static_cast(val); } +VTK_ABI_NAMESPACE_END } // end namespace vtk_detail +VTK_ABI_NAMESPACE_BEGIN //----------------------------------------------------------------------------- #if defined(VTK_HAS_ISINF) || defined(VTK_HAS_STD_ISINF) #define VTK_MATH_ISINF_IS_INLINE @@ -2144,4 +2157,5 @@ inline bool vtkMath::IsFinite(double x) } #endif +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkMathPrivate.hxx b/Common/Core/vtkMathPrivate.hxx index 3b28e526c8..8a35ad5156 100644 --- a/Common/Core/vtkMathPrivate.hxx +++ b/Common/Core/vtkMathPrivate.hxx @@ -33,6 +33,7 @@ namespace vtkMathPrivate { +VTK_ABI_NAMESPACE_BEGIN static constexpr int VTK_MATH_PRIVATE_PACK_SIZE = 4; //============================================================================= @@ -953,5 +954,6 @@ public: y[2] = x[2] / M[2]; } }; +VTK_ABI_NAMESPACE_END } // namespace vtkMathPrivate #endif diff --git a/Common/Core/vtkMathUtilities.h b/Common/Core/vtkMathUtilities.h index 9063cc086a..79550395f3 100644 --- a/Common/Core/vtkMathUtilities.h +++ b/Common/Core/vtkMathUtilities.h @@ -27,6 +27,8 @@ #ifndef vtkMathUtilities_h #define vtkMathUtilities_h +#include "vtkABINamespace.h" + #include #include #include @@ -34,6 +36,7 @@ namespace vtkMathUtilities { +VTK_ABI_NAMESPACE_BEGIN /** * Perform a fuzzy compare of floats/doubles, specify the allowed tolerance @@ -137,6 +140,7 @@ void UpdateRange(A& min0, A& max0, const A& value, } } +VTK_ABI_NAMESPACE_END } // End vtkMathUtilities namespace. #endif // vtkMathUtilities_h diff --git a/Common/Core/vtkMatrixUtilities.h b/Common/Core/vtkMatrixUtilities.h index 3576dc9faa..00d45a3362 100644 --- a/Common/Core/vtkMatrixUtilities.h +++ b/Common/Core/vtkMatrixUtilities.h @@ -27,10 +27,13 @@ #ifndef vtkMatrixUtilities_h #define vtkMatrixUtilities_h +#include "vtkABINamespace.h" + #include // for type traits namespace vtkMatrixUtilities { +VTK_ABI_NAMESPACE_BEGIN //============================================================================= /** * This struct determines a prior transform to input matrices, changing the @@ -353,6 +356,7 @@ public: MatrixLayoutIs2D()>::template Get(M); } }; +VTK_ABI_NAMESPACE_END } // namespace vtkMatrixUtilities #endif diff --git a/Common/Core/vtkMersenneTwister.cxx b/Common/Core/vtkMersenneTwister.cxx index e622354258..32229b04b7 100644 --- a/Common/Core/vtkMersenneTwister.cxx +++ b/Common/Core/vtkMersenneTwister.cxx @@ -124,6 +124,7 @@ const int* MersenneExponentsEnd = MersenneExponents + NMersenneExponents; #include "vtkMersenneTwister.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN class vtkMersenneTwisterInternals : public MersenneTwister { public: @@ -227,3 +228,4 @@ void vtkMersenneTwister::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkMersenneTwister.h b/Common/Core/vtkMersenneTwister.h index 9ab2b804e7..f13b6dfd40 100644 --- a/Common/Core/vtkMersenneTwister.h +++ b/Common/Core/vtkMersenneTwister.h @@ -71,6 +71,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkRandomSequence.h" +VTK_ABI_NAMESPACE_BEGIN class vtkMersenneTwisterInternals; class VTKCOMMONCORE_EXPORT vtkMersenneTwister : public vtkRandomSequence @@ -147,4 +148,5 @@ private: void operator=(const vtkMersenneTwister&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // #ifndef vtkMersenneTwister_h diff --git a/Common/Core/vtkMersenneTwister_Private.cxx b/Common/Core/vtkMersenneTwister_Private.cxx index 04a413018b..1bdfec96ef 100644 --- a/Common/Core/vtkMersenneTwister_Private.cxx +++ b/Common/Core/vtkMersenneTwister_Private.cxx @@ -89,6 +89,8 @@ typedef vtkTypeUInt8 uint8_t; // dc.h +VTK_ABI_NAMESPACE_BEGIN + typedef struct mt_struct_ { uint32_t aaa; int mm,nn,rr,ww; @@ -1765,6 +1767,8 @@ int CheckPeriod_dc_(check32_t *ck, org_state_ *st, return REDU; } +VTK_ABI_NAMESPACE_END + #undef N #undef NOT_REJECTED #undef REJECTED diff --git a/Common/Core/vtkMeta.h b/Common/Core/vtkMeta.h index 9247430237..284c5c82dd 100644 --- a/Common/Core/vtkMeta.h +++ b/Common/Core/vtkMeta.h @@ -16,6 +16,8 @@ #ifndef vtkMeta_h #define vtkMeta_h +#include "vtkABINamespace.h" + #include #include @@ -26,17 +28,20 @@ */ // Forward decs for StripPointers: +VTK_ABI_NAMESPACE_BEGIN template class vtkNew; template class vtkSmartPointer; template class vtkWeakPointer; +VTK_ABI_NAMESPACE_END namespace vtk { namespace detail { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // Strip vtkNew, vtkSmartPointer, etc from a type. @@ -86,6 +91,7 @@ public: static constexpr bool value = bool_constant::value; }; +VTK_ABI_NAMESPACE_END } } // end namespace vtk::detail diff --git a/Common/Core/vtkMinimalStandardRandomSequence.cxx b/Common/Core/vtkMinimalStandardRandomSequence.cxx index 220a888b71..ad87ad385d 100644 --- a/Common/Core/vtkMinimalStandardRandomSequence.cxx +++ b/Common/Core/vtkMinimalStandardRandomSequence.cxx @@ -16,6 +16,7 @@ #include "vtkObjectFactory.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMinimalStandardRandomSequence); const int VTK_K_A = 16807; @@ -121,3 +122,4 @@ void vtkMinimalStandardRandomSequence::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkMinimalStandardRandomSequence.h b/Common/Core/vtkMinimalStandardRandomSequence.h index b0be7260be..274f534450 100644 --- a/Common/Core/vtkMinimalStandardRandomSequence.h +++ b/Common/Core/vtkMinimalStandardRandomSequence.h @@ -38,6 +38,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkRandomSequence.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkMinimalStandardRandomSequence : public vtkRandomSequence { public: @@ -134,4 +135,5 @@ private: void operator=(const vtkMinimalStandardRandomSequence&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // #ifndef vtkMinimalStandardRandomSequence_h diff --git a/Common/Core/vtkMultiThreader.cxx b/Common/Core/vtkMultiThreader.cxx index 1ca92374a2..b67b0b888a 100644 --- a/Common/Core/vtkMultiThreader.cxx +++ b/Common/Core/vtkMultiThreader.cxx @@ -17,7 +17,9 @@ #include "vtkObjectFactory.h" #include "vtkWindows.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMultiThreader); +VTK_ABI_NAMESPACE_END // Need to define "vtkExternCThreadFunctionType" to avoid warning on some // platforms about passing function pointer to an argument expecting an @@ -39,6 +41,7 @@ typedef vtkThreadFunctionType vtkExternCThreadFunctionType; #endif // Initialize static member that controls global maximum number of threads +VTK_ABI_NAMESPACE_BEGIN static int vtkMultiThreaderGlobalMaximumNumberOfThreads = 0; void vtkMultiThreader::SetGlobalMaximumNumberOfThreads(int val) @@ -642,3 +645,4 @@ void vtkMultiThreader::PrintSelf(ostream& os, vtkIndent indent) #endif << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkMultiThreader.h b/Common/Core/vtkMultiThreader.h index 0d8fd81fee..ceed531045 100644 --- a/Common/Core/vtkMultiThreader.h +++ b/Common/Core/vtkMultiThreader.h @@ -73,6 +73,7 @@ typedef int vtkThreadProcessIDType; typedef int vtkMultiThreaderIDType; #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkMultiThreader : public vtkObject { public: @@ -233,4 +234,5 @@ private: using ThreadInfoStruct = vtkMultiThreader::ThreadInfo; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkNew.h b/Common/Core/vtkNew.h index 06a06576f0..cc54702559 100644 --- a/Common/Core/vtkNew.h +++ b/Common/Core/vtkNew.h @@ -49,6 +49,7 @@ #include // for is_base_of +VTK_ABI_NAMESPACE_BEGIN class vtkObjectBase; template @@ -171,5 +172,6 @@ private: T* Object; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkNew.h diff --git a/Common/Core/vtkOStrStreamWrapper.cxx b/Common/Core/vtkOStrStreamWrapper.cxx index 5da8eac9f5..b42fd4fb48 100644 --- a/Common/Core/vtkOStrStreamWrapper.cxx +++ b/Common/Core/vtkOStrStreamWrapper.cxx @@ -22,6 +22,7 @@ using std::ostringstream; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkOStrStreamWrapper::vtkOStrStreamWrapper() : vtkOStreamWrapper(*(new ostringstream)) { @@ -69,3 +70,4 @@ void vtkOStrStreamWrapper::freeze(int f) { this->Frozen = f; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkOStrStreamWrapper.h b/Common/Core/vtkOStrStreamWrapper.h index 77f40477dd..babfa1cfe1 100644 --- a/Common/Core/vtkOStrStreamWrapper.h +++ b/Common/Core/vtkOStrStreamWrapper.h @@ -33,6 +33,7 @@ Do_not_include_vtkOStrStreamWrapper_directly_vtkSystemIncludes_includes_it; #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkOStrStreamWrapper : public vtkOStreamWrapper { public: @@ -80,5 +81,6 @@ private: vtkOStrStreamWrapper& operator=(const vtkOStrStreamWrapper&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkOStrStreamWrapper.h diff --git a/Common/Core/vtkOStreamWrapper.cxx b/Common/Core/vtkOStreamWrapper.cxx index 32b7e83fe8..c985d303eb 100644 --- a/Common/Core/vtkOStreamWrapper.cxx +++ b/Common/Core/vtkOStreamWrapper.cxx @@ -38,6 +38,7 @@ } //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkOStreamWrapper::vtkOStreamWrapper(ostream& os) : ostr(os) { @@ -136,3 +137,4 @@ void vtkOStreamWrapper::flush() { this->ostr.flush(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkOStreamWrapper.h b/Common/Core/vtkOStreamWrapper.h index 9c8a5dc3cf..fb5d1619ad 100644 --- a/Common/Core/vtkOStreamWrapper.h +++ b/Common/Core/vtkOStreamWrapper.h @@ -33,6 +33,7 @@ Do_not_include_vtkOStreamWrapper_directly_vtkSystemIncludes_includes_it; #endif +VTK_ABI_NAMESPACE_BEGIN class vtkIndent; class vtkObjectBase; class vtkLargeInteger; @@ -168,5 +169,6 @@ private: vtkOStreamWrapper& operator<<(std_string const&); }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkOStreamWrapper.h diff --git a/Common/Core/vtkObject.cxx b/Common/Core/vtkObject.cxx index 5d5c1816bd..747f53a1ec 100644 --- a/Common/Core/vtkObject.cxx +++ b/Common/Core/vtkObject.cxx @@ -26,6 +26,7 @@ #include // Initialize static member that controls warning display +VTK_ABI_NAMESPACE_BEGIN static int vtkObjectGlobalWarningDisplay = 1; //------------------------------------------------------------------------------ @@ -1008,3 +1009,4 @@ std::string vtkObject::GetObjectDescription() const } return s.str(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkObject.h b/Common/Core/vtkObject.h index b4a5123637..23a4306979 100644 --- a/Common/Core/vtkObject.h +++ b/Common/Core/vtkObject.h @@ -47,6 +47,7 @@ #include "vtkTimeStamp.h" #include "vtkWeakPointerBase.h" // needed for vtkWeakPointer +VTK_ABI_NAMESPACE_BEGIN class vtkSubjectHelper; class vtkCommand; @@ -420,5 +421,6 @@ private: ///@} }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkObject.h diff --git a/Common/Core/vtkObjectBase.cxx b/Common/Core/vtkObjectBase.cxx index e06ef845be..a7d4db0089 100644 --- a/Common/Core/vtkObjectBase.cxx +++ b/Common/Core/vtkObjectBase.cxx @@ -24,11 +24,14 @@ #ifdef VTK_USE_MEMKIND #include +VTK_ABI_NAMESPACE_BEGIN struct memkind* MemkindHandle = nullptr; +VTK_ABI_NAMESPACE_END #endif #define vtkBaseDebugMacro(x) +VTK_ABI_NAMESPACE_BEGIN class vtkObjectBaseToGarbageCollectorFriendship { public: @@ -365,6 +368,7 @@ void vtkObjectBase::ReportReferences(vtkGarbageCollector*) { // vtkObjectBase has no references to report. } +VTK_ABI_NAMESPACE_END namespace { @@ -378,6 +382,7 @@ VTK_THREAD_LOCAL vtkFreeingFunction CurrentFreeFunction = free; VTK_THREAD_LOCAL vtkFreeingFunction AlternateFreeFunction = vtkCustomFree; } +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ void vtkObjectBase::SetMemkindDirectory(const char* directoryname) { @@ -522,3 +527,4 @@ void vtkObjectBase::vtkMemkindRAII::Restore() vtkObjectBase::SetUsingMemkind(this->OriginalValue); #endif } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkObjectBase.h b/Common/Core/vtkObjectBase.h index 461befac19..ec5bfaedc3 100644 --- a/Common/Core/vtkObjectBase.h +++ b/Common/Core/vtkObjectBase.h @@ -57,6 +57,7 @@ #include // For std::atomic #include +VTK_ABI_NAMESPACE_BEGIN class vtkGarbageCollector; class vtkGarbageCollectorToObjectBaseFriendship; class vtkWeakPointerBase; @@ -330,6 +331,7 @@ protected: vtkObjectBase(const vtkObjectBase&) {} void operator=(const vtkObjectBase&) {} }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkObjectBase.h diff --git a/Common/Core/vtkObjectFactory.cxx b/Common/Core/vtkObjectFactory.cxx index 77c5d59c61..0ad902a772 100644 --- a/Common/Core/vtkObjectFactory.cxx +++ b/Common/Core/vtkObjectFactory.cxx @@ -25,6 +25,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkObjectFactoryCollection* vtkObjectFactory::RegisteredFactories = nullptr; static unsigned int vtkObjectFactoryRegistryCleanupCounter = 0; @@ -646,3 +647,4 @@ void vtkObjectFactory::CreateAllInstance(const char* vtkclassname, vtkCollection } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkObjectFactory.h b/Common/Core/vtkObjectFactory.h index 7f9bd20bc0..16a01acbb8 100644 --- a/Common/Core/vtkObjectFactory.h +++ b/Common/Core/vtkObjectFactory.h @@ -45,6 +45,7 @@ #include // for std::string +VTK_ABI_NAMESPACE_BEGIN class vtkObjectFactoryCollection; class vtkOverrideInformationCollection; class vtkCollection; @@ -288,6 +289,7 @@ static vtkObjectFactoryRegistryCleanup vtkObjectFactoryRegistryCleanupInstance; #define VTK_CREATE_CREATE_FUNCTION(classname) \ static vtkObject* vtkObjectFactoryCreate##classname() { return classname::New(); } +VTK_ABI_NAMESPACE_END #endif #define VTK_FACTORY_INTERFACE_EXPORT VTKCOMMONCORE_EXPORT diff --git a/Common/Core/vtkObjectFactoryCollection.cxx b/Common/Core/vtkObjectFactoryCollection.cxx index 2b4a632446..4922f77a70 100644 --- a/Common/Core/vtkObjectFactoryCollection.cxx +++ b/Common/Core/vtkObjectFactoryCollection.cxx @@ -17,6 +17,7 @@ #include "vtkDebugLeaks.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkObjectFactoryCollection* vtkObjectFactoryCollection::New() { // Don't use the object factory macros. Creating an object factory here @@ -30,3 +31,4 @@ void vtkObjectFactoryCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkObjectFactoryCollection.h b/Common/Core/vtkObjectFactoryCollection.h index ebff6718bc..bb8d2f3b91 100644 --- a/Common/Core/vtkObjectFactoryCollection.h +++ b/Common/Core/vtkObjectFactoryCollection.h @@ -31,6 +31,7 @@ #include "vtkObjectFactory.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkObjectFactoryCollection : public vtkCollection { public: @@ -74,4 +75,5 @@ private: void operator=(const vtkObjectFactoryCollection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkOldStyleCallbackCommand.cxx b/Common/Core/vtkOldStyleCallbackCommand.cxx index 4ec540f6b8..2fd8eca455 100644 --- a/Common/Core/vtkOldStyleCallbackCommand.cxx +++ b/Common/Core/vtkOldStyleCallbackCommand.cxx @@ -21,6 +21,7 @@ #include //---------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN vtkOldStyleCallbackCommand::vtkOldStyleCallbackCommand() { this->ClientData = nullptr; @@ -43,3 +44,4 @@ void vtkOldStyleCallbackCommand::Execute(vtkObject*, unsigned long, void*) this->Callback(this->ClientData); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkOldStyleCallbackCommand.h b/Common/Core/vtkOldStyleCallbackCommand.h index ea9ecdfc81..39b407b2ed 100644 --- a/Common/Core/vtkOldStyleCallbackCommand.h +++ b/Common/Core/vtkOldStyleCallbackCommand.h @@ -38,6 +38,7 @@ #include "vtkCommonCoreModule.h" // For export macro // the old style void fund(void *) callbacks +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkOldStyleCallbackCommand : public vtkCommand { public: @@ -68,6 +69,7 @@ protected: ~vtkOldStyleCallbackCommand() override; }; +VTK_ABI_NAMESPACE_END #endif /* vtkOldStyleCallbackCommand_h */ // VTK-HeaderTest-Exclude: vtkOldStyleCallbackCommand.h diff --git a/Common/Core/vtkOutputWindow.cxx b/Common/Core/vtkOutputWindow.cxx index a8cd85f66b..cb2839159d 100644 --- a/Common/Core/vtkOutputWindow.cxx +++ b/Common/Core/vtkOutputWindow.cxx @@ -50,6 +50,7 @@ public: }; } +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ std::mutex InstanceLock; // XXX(c++17): use a `shared_mutex` vtkSmartPointer vtkOutputWindowGlobalInstance; @@ -368,3 +369,4 @@ void vtkOutputWindow::SetInstance(vtkOutputWindow* instance) vtkOutputWindowGlobalInstance = vtk::MakeSmartPointer(instance); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkOutputWindow.h b/Common/Core/vtkOutputWindow.h index 06e6160d2f..fb80340c86 100644 --- a/Common/Core/vtkOutputWindow.h +++ b/Common/Core/vtkOutputWindow.h @@ -30,6 +30,7 @@ #include "vtkDeprecation.h" // For `VTK_DEPRECATED_IN_9_3_0` #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTK_DEPRECATED_IN_9_3_0( "`vtkOutputWindowCleanup` is no longer necessary") VTKCOMMONCORE_EXPORT vtkOutputWindowCleanup { @@ -186,4 +187,5 @@ private: void operator=(const vtkOutputWindow&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkOverrideInformation.cxx b/Common/Core/vtkOverrideInformation.cxx index 8d876d485a..3492bec1aa 100644 --- a/Common/Core/vtkOverrideInformation.cxx +++ b/Common/Core/vtkOverrideInformation.cxx @@ -16,6 +16,7 @@ #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkOverrideInformation); vtkCxxSetObjectMacro(vtkOverrideInformation, ObjectFactory, vtkObjectFactory); @@ -64,3 +65,4 @@ void vtkOverrideInformation::PrintSelf(ostream& os, vtkIndent indent) os << n << "(none)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkOverrideInformation.h b/Common/Core/vtkOverrideInformation.h index 7b40aa22a7..89e11f70c4 100644 --- a/Common/Core/vtkOverrideInformation.h +++ b/Common/Core/vtkOverrideInformation.h @@ -27,6 +27,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkObjectFactory; class VTKCOMMONCORE_EXPORT vtkOverrideInformation : public vtkObject @@ -102,4 +103,5 @@ private: void operator=(const vtkOverrideInformation&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkOverrideInformationCollection.cxx b/Common/Core/vtkOverrideInformationCollection.cxx index 657766e456..a1df099ba6 100644 --- a/Common/Core/vtkOverrideInformationCollection.cxx +++ b/Common/Core/vtkOverrideInformationCollection.cxx @@ -15,9 +15,11 @@ #include "vtkOverrideInformationCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkOverrideInformationCollection); void vtkOverrideInformationCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkOverrideInformationCollection.h b/Common/Core/vtkOverrideInformationCollection.h index 739056c797..5a7867f31f 100644 --- a/Common/Core/vtkOverrideInformationCollection.h +++ b/Common/Core/vtkOverrideInformationCollection.h @@ -30,6 +30,7 @@ #include "vtkOverrideInformation.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkOverrideInformationCollection : public vtkCollection { public: @@ -79,4 +80,5 @@ inline vtkOverrideInformation* vtkOverrideInformationCollection::GetNextItem() return static_cast(this->GetNextItemAsObject()); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkPoints.cxx b/Common/Core/vtkPoints.cxx index 0f54497751..3865d3d6cf 100644 --- a/Common/Core/vtkPoints.cxx +++ b/Common/Core/vtkPoints.cxx @@ -22,6 +22,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkPoints* vtkPoints::New(int dataType) { // First try to create the object from the vtkObjectFactory @@ -284,3 +285,4 @@ void vtkPoints::PrintSelf(ostream& os, vtkIndent indent) os << indent << " Ymin,Ymax: (" << bounds[2] << ", " << bounds[3] << ")\n"; os << indent << " Zmin,Zmax: (" << bounds[4] << ", " << bounds[5] << ")\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkPoints.h b/Common/Core/vtkPoints.h index d70e6e0968..b6363b6332 100644 --- a/Common/Core/vtkPoints.h +++ b/Common/Core/vtkPoints.h @@ -28,6 +28,7 @@ #include "vtkDataArray.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class VTKCOMMONCORE_EXPORT vtkPoints : public vtkObject @@ -302,4 +303,5 @@ inline vtkIdType vtkPoints::InsertNextPoint(double x, double y, double z) return this->Data->InsertNextTuple(p); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkPoints2D.cxx b/Common/Core/vtkPoints2D.cxx index 3abab6f06c..ed5efb1ca1 100644 --- a/Common/Core/vtkPoints2D.cxx +++ b/Common/Core/vtkPoints2D.cxx @@ -30,6 +30,7 @@ #include "vtkUnsignedShortArray.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkPoints2D* vtkPoints2D::New(int dataType) { // First try to create the object from the vtkObjectFactory @@ -232,3 +233,4 @@ void vtkPoints2D::PrintSelf(ostream& os, vtkIndent indent) os << indent << " Xmin,Xmax: (" << bounds[0] << ", " << bounds[1] << ")\n"; os << indent << " Ymin,Ymax: (" << bounds[2] << ", " << bounds[3] << ")\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkPoints2D.h b/Common/Core/vtkPoints2D.h index 35269e1c0d..552ee17472 100644 --- a/Common/Core/vtkPoints2D.h +++ b/Common/Core/vtkPoints2D.h @@ -28,6 +28,7 @@ #include "vtkDataArray.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class VTKCOMMONCORE_EXPORT vtkPoints2D : public vtkObject @@ -250,4 +251,5 @@ inline vtkIdType vtkPoints2D::InsertNextPoint(double x, double y) return this->Data->InsertNextTuple(p); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkPriorityQueue.cxx b/Common/Core/vtkPriorityQueue.cxx index 482d1d9589..b8d638e678 100644 --- a/Common/Core/vtkPriorityQueue.cxx +++ b/Common/Core/vtkPriorityQueue.cxx @@ -15,6 +15,7 @@ #include "vtkPriorityQueue.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPriorityQueue); // Instantiate priority queue with default size and extension size of 1000. @@ -241,3 +242,4 @@ void vtkPriorityQueue::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Size: " << this->Size << "\n"; os << indent << "Extend size: " << this->Extend << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkPriorityQueue.h b/Common/Core/vtkPriorityQueue.h index b8d2eebd4e..f9a06487c9 100644 --- a/Common/Core/vtkPriorityQueue.h +++ b/Common/Core/vtkPriorityQueue.h @@ -43,6 +43,7 @@ #include "vtkIdTypeArray.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkPriorityQueue : public vtkObject { public: @@ -186,4 +187,5 @@ inline vtkIdType vtkPriorityQueue::Peek(vtkIdType location) } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkRandomPool.cxx b/Common/Core/vtkRandomPool.cxx index 5b3ace9735..f061668e4f 100644 --- a/Common/Core/vtkRandomPool.cxx +++ b/Common/Core/vtkRandomPool.cxx @@ -27,8 +27,10 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkRandomPool); vtkCxxSetObjectMacro(vtkRandomPool, Sequence, vtkRandomSequence); +VTK_ABI_NAMESPACE_END //------------------------------------------------------------------------------ // Static methods to populate a data array. @@ -138,6 +140,8 @@ struct PopulateDAComponentLauncher } // anonymous namespace +VTK_ABI_NAMESPACE_BEGIN + //------------------------------------------------------------------------------ vtkRandomPool::vtkRandomPool() { @@ -362,3 +366,4 @@ void vtkRandomPool::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Number Of Components: " << this->NumberOfComponents << "\n"; os << indent << "Chunk Size: " << this->ChunkSize << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkRandomPool.h b/Common/Core/vtkRandomPool.h index 6ee2ef9de0..c51946a32f 100644 --- a/Common/Core/vtkRandomPool.h +++ b/Common/Core/vtkRandomPool.h @@ -42,6 +42,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkRandomSequence; class vtkDataArray; @@ -163,4 +164,5 @@ private: void operator=(const vtkRandomPool&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkRandomSequence.cxx b/Common/Core/vtkRandomSequence.cxx index ca37afcfcb..d3211a9a97 100644 --- a/Common/Core/vtkRandomSequence.cxx +++ b/Common/Core/vtkRandomSequence.cxx @@ -16,6 +16,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkRandomSequence::vtkRandomSequence() = default; //------------------------------------------------------------------------------ @@ -33,3 +34,4 @@ double vtkRandomSequence::GetNextValue() this->Next(); return this->GetValue(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkRandomSequence.h b/Common/Core/vtkRandomSequence.h index f5094e5e09..8f2212f6ea 100644 --- a/Common/Core/vtkRandomSequence.h +++ b/Common/Core/vtkRandomSequence.h @@ -34,6 +34,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkRandomSequence : public vtkObject { public: @@ -74,4 +75,5 @@ private: void operator=(const vtkRandomSequence&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // #ifndef vtkRandomSequence_h diff --git a/Common/Core/vtkRange.h b/Common/Core/vtkRange.h index dd09e1b380..73e333b9ff 100644 --- a/Common/Core/vtkRange.h +++ b/Common/Core/vtkRange.h @@ -25,6 +25,7 @@ namespace vtk { +VTK_ABI_NAMESPACE_BEGIN /** * Generate an iterable STL proxy object for a VTK container. @@ -90,6 +91,7 @@ auto Range(IterablePtr iterable, Options&&... opts) -> return RangeType{ iterable, std::forward(opts)... }; } +VTK_ABI_NAMESPACE_END } // end namespace vtk #endif // vtkRange_h diff --git a/Common/Core/vtkRangeIterableTraits.h b/Common/Core/vtkRangeIterableTraits.h index b451232e38..e4ccb3ba6c 100644 --- a/Common/Core/vtkRangeIterableTraits.h +++ b/Common/Core/vtkRangeIterableTraits.h @@ -16,14 +16,19 @@ #ifndef vtkRangeIterableTraits_h #define vtkRangeIterableTraits_h +#include "vtkABINamespace.h" + +VTK_ABI_NAMESPACE_BEGIN class vtkCollection; class vtkCompositeDataSet; class vtkDataObjectTree; +VTK_ABI_NAMESPACE_END namespace vtk { namespace detail { +VTK_ABI_NAMESPACE_BEGIN template struct CollectionRange; @@ -63,6 +68,7 @@ public: using RangeType = typename std::decay::type; }; +VTK_ABI_NAMESPACE_END } } diff --git a/Common/Core/vtkReferenceCount.cxx b/Common/Core/vtkReferenceCount.cxx index 515d2c7dd7..a11b76047c 100644 --- a/Common/Core/vtkReferenceCount.cxx +++ b/Common/Core/vtkReferenceCount.cxx @@ -15,6 +15,7 @@ #include "vtkReferenceCount.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkReferenceCount); vtkReferenceCount::vtkReferenceCount() = default; @@ -25,3 +26,4 @@ void vtkReferenceCount::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkReferenceCount.h b/Common/Core/vtkReferenceCount.h index d123410edd..8ea3f58b18 100644 --- a/Common/Core/vtkReferenceCount.h +++ b/Common/Core/vtkReferenceCount.h @@ -27,6 +27,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkReferenceCount : public vtkObject { public: @@ -44,4 +45,5 @@ private: void operator=(const vtkReferenceCount&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkSMPThreadLocal.h b/Common/Core/vtkSMPThreadLocal.h index 07609dd0ce..590d0bdd4b 100644 --- a/Common/Core/vtkSMPThreadLocal.h +++ b/Common/Core/vtkSMPThreadLocal.h @@ -83,6 +83,7 @@ #include "SMP/Common/vtkSMPThreadLocalAPI.h" +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPThreadLocal { @@ -148,5 +149,6 @@ private: void operator=(const vtkSMPThreadLocal&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkSMPThreadLocal.h diff --git a/Common/Core/vtkSMPThreadLocalObject.h b/Common/Core/vtkSMPThreadLocalObject.h index a700f69cef..822b5ae816 100644 --- a/Common/Core/vtkSMPThreadLocalObject.h +++ b/Common/Core/vtkSMPThreadLocalObject.h @@ -76,6 +76,7 @@ #include "vtkSMPThreadLocal.h" +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPThreadLocalObject { @@ -202,5 +203,6 @@ private: T* Exemplar; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkSMPThreadLocalObject.h diff --git a/Common/Core/vtkSMPTools.cxx b/Common/Core/vtkSMPTools.cxx index 00fb805e6f..184bb12fd1 100644 --- a/Common/Core/vtkSMPTools.cxx +++ b/Common/Core/vtkSMPTools.cxx @@ -18,6 +18,7 @@ #include "vtkSMP.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN const char* vtkSMPTools::GetBackend() { auto& SMPToolsAPI = vtk::detail::smp::vtkSMPToolsAPI::GetInstance(); @@ -72,3 +73,4 @@ bool vtkSMPTools::GetSingleThread() auto& SMPToolsAPI = vtk::detail::smp::vtkSMPToolsAPI::GetInstance(); return SMPToolsAPI.GetSingleThread(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkSMPTools.h b/Common/Core/vtkSMPTools.h index e95a81f598..0e5b019de0 100644 --- a/Common/Core/vtkSMPTools.h +++ b/Common/Core/vtkSMPTools.h @@ -46,6 +46,7 @@ namespace detail { namespace smp { +VTK_ABI_NAMESPACE_BEGIN template class vtkSMPTools_Has_Initialize { @@ -218,11 +219,13 @@ public: template using resolvedNotInt = typename std::enable_if::value, void>::type; +VTK_ABI_NAMESPACE_END } // namespace smp } // namespace detail } // namespace vtk #endif // DOXYGEN_SHOULD_SKIP_THIS +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkSMPTools { public: @@ -602,5 +605,6 @@ public: } }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkSMPTools.h diff --git a/Common/Core/vtkSOADataArrayTemplate.h b/Common/Core/vtkSOADataArrayTemplate.h index a25876e186..c65d5739a4 100644 --- a/Common/Core/vtkSOADataArrayTemplate.h +++ b/Common/Core/vtkSOADataArrayTemplate.h @@ -35,6 +35,7 @@ // The export macro below makes no sense, but is necessary for older compilers // when we export instantiations of this class from vtkCommonCore. +VTK_ABI_NAMESPACE_BEGIN template class VTKCOMMONCORE_EXPORT vtkSOADataArrayTemplate : public vtkGenericDataArray, ValueTypeT> @@ -243,6 +244,7 @@ private: // Declare vtkArrayDownCast implementations for SoA containers: vtkArrayDownCast_TemplateFastCastMacro(vtkSOADataArrayTemplate); +VTK_ABI_NAMESPACE_END #endif // header guard // This portion must be OUTSIDE the include blockers. This is used to tell @@ -253,9 +255,13 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkSOADataArrayTemplate); #define VTK_SOA_DATA_ARRAY_TEMPLATE_INSTANTIATE(T) \ namespace vtkDataArrayPrivate \ { \ + VTK_ABI_NAMESPACE_BEGIN \ VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(vtkSOADataArrayTemplate, double); \ + VTK_ABI_NAMESPACE_END \ } \ - template class VTKCOMMONCORE_EXPORT vtkSOADataArrayTemplate + VTK_ABI_NAMESPACE_BEGIN \ + template class VTKCOMMONCORE_EXPORT vtkSOADataArrayTemplate; \ + VTK_ABI_NAMESPACE_END #elif defined(VTK_USE_EXTERN_TEMPLATE) #ifndef VTK_SOA_DATA_ARRAY_TEMPLATE_EXTERN @@ -266,10 +272,12 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkSOADataArrayTemplate); // dllexport and is used from another class in vtkCommonCore #pragma warning(disable : 4910) // extern and dllexport incompatible #endif +VTK_ABI_NAMESPACE_BEGIN vtkExternTemplateMacro(extern template class VTKCOMMONCORE_EXPORT vtkSOADataArrayTemplate); #ifdef _MSC_VER #pragma warning(pop) #endif +VTK_ABI_NAMESPACE_END #endif // VTK_SOA_DATA_ARRAY_TEMPLATE_EXTERN // The following clause is only for MSVC 2008 and 2010 @@ -297,10 +305,12 @@ vtkExternTemplateMacro(extern template class VTKCOMMONCORE_EXPORT vtkSOADataArra // Use an "extern explicit instantiation" to give the class a DLL // interface. This is a compiler-specific extension. +VTK_ABI_NAMESPACE_BEGIN vtkInstantiateTemplateMacro(extern template class VTKCOMMONCORE_EXPORT vtkSOADataArrayTemplate); #pragma warning(pop) +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkSOADataArrayTemplate.h diff --git a/Common/Core/vtkSOADataArrayTemplate.txx b/Common/Core/vtkSOADataArrayTemplate.txx index d1e6a06367..8e590ad0a0 100644 --- a/Common/Core/vtkSOADataArrayTemplate.txx +++ b/Common/Core/vtkSOADataArrayTemplate.txx @@ -30,6 +30,7 @@ #include //----------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN template vtkSOADataArrayTemplate* vtkSOADataArrayTemplate::New() { @@ -384,4 +385,5 @@ void vtkSOADataArrayTemplate::ExportToVoidPointer(void* voidPtr) } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkScalarsToColors.cxx b/Common/Core/vtkScalarsToColors.cxx index 823bb2cd00..faf4aa7c7b 100644 --- a/Common/Core/vtkScalarsToColors.cxx +++ b/Common/Core/vtkScalarsToColors.cxx @@ -31,6 +31,7 @@ // Note you cannot use a map or sort etc as the // comparison operator for vtkVarient is not suitable // for strict sorting. +VTK_ABI_NAMESPACE_BEGIN class vtkScalarsToColors::vtkInternalAnnotatedValueList : public std::list { }; @@ -457,6 +458,7 @@ void vtkScalarsToColors::MapScalarsThroughTable( this->MapScalarsThroughTable(scalars->GetVoidPointer(0), output, scalars->GetDataType(), scalars->GetNumberOfTuples(), scalars->GetNumberOfComponents(), outputFormat); } +VTK_ABI_NAMESPACE_END //------------------------------------------------------------------------------ // Color type converters in anonymous namespace @@ -1072,6 +1074,7 @@ unsigned char* vtkScalarsToColorsUnpackBits(void* inPtr, vtkIdType numValues) // end anonymous namespace } +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ void vtkScalarsToColors::MapColorsToColors(void* inPtr, unsigned char* outPtr, int inputDataType, int numberOfTuples, int numberOfComponents, int inputFormat, int outputFormat) @@ -1838,3 +1841,4 @@ void vtkScalarsToColors::UpdateAnnotatedValueMap() this->AnnotatedValueList->push_back(this->AnnotatedValues->GetVariantValue(i)); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkScalarsToColors.h b/Common/Core/vtkScalarsToColors.h index ea8d1c317b..69a3e54bb7 100644 --- a/Common/Core/vtkScalarsToColors.h +++ b/Common/Core/vtkScalarsToColors.h @@ -50,6 +50,7 @@ #include "vtkObject.h" #include "vtkVariant.h" // Set/get annotation methods require variants. +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractArray; class vtkDataArray; class vtkUnsignedCharArray; @@ -483,4 +484,5 @@ inline unsigned char vtkScalarsToColors::ColorToUChar(float t) } ///@} +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkScaledSOADataArrayTemplate.h b/Common/Core/vtkScaledSOADataArrayTemplate.h index 285d2b5513..4c009e5e7f 100644 --- a/Common/Core/vtkScaledSOADataArrayTemplate.h +++ b/Common/Core/vtkScaledSOADataArrayTemplate.h @@ -41,6 +41,7 @@ // The export macro below makes no sense, but is necessary for older compilers // when we export instantiations of this class from vtkCommonCore. +VTK_ABI_NAMESPACE_BEGIN template class VTKCOMMONCORE_EXPORT vtkScaledSOADataArrayTemplate : public vtkGenericDataArray, ValueTypeT> @@ -292,6 +293,7 @@ private: // Declare vtkArrayDownCast implementations for scale SoA containers: vtkArrayDownCast_TemplateFastCastMacro(vtkScaledSOADataArrayTemplate); +VTK_ABI_NAMESPACE_END #endif // header guard // This portion must be OUTSIDE the include blockers. This is used to tell @@ -302,9 +304,13 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkScaledSOADataArrayTemplate); #define VTK_SCALED_SOA_DATA_ARRAY_TEMPLATE_INSTANTIATE(T) \ namespace vtkDataArrayPrivate \ { \ + VTK_ABI_NAMESPACE_BEGIN \ VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(vtkScaledSOADataArrayTemplate, double); \ + VTK_ABI_NAMESPACE_END \ } \ - template class VTKCOMMONCORE_EXPORT vtkScaledSOADataArrayTemplate + VTK_ABI_NAMESPACE_BEGIN \ + template class VTKCOMMONCORE_EXPORT vtkScaledSOADataArrayTemplate; \ + VTK_ABI_NAMESPACE_END #elif defined(VTK_USE_EXTERN_TEMPLATE) #ifndef VTK_SCALED_SOA_DATA_ARRAY_TEMPLATE_EXTERN @@ -315,10 +321,12 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkScaledSOADataArrayTemplate); // dllexport and is used from another class in vtkCommonCore #pragma warning(disable : 4910) // extern and dllexport incompatible #endif +VTK_ABI_NAMESPACE_BEGIN vtkExternTemplateMacro(extern template class VTKCOMMONCORE_EXPORT vtkScaledSOADataArrayTemplate); #ifdef _MSC_VER #pragma warning(pop) #endif +VTK_ABI_NAMESPACE_END #endif // VTK_SCALED_SOA_DATA_ARRAY_TEMPLATE_EXTERN // The following clause is only for MSVC 2008 and 2010 @@ -346,11 +354,13 @@ vtkExternTemplateMacro(extern template class VTKCOMMONCORE_EXPORT vtkScaledSOADa // Use an "extern explicit instantiation" to give the class a DLL // interface. This is a compiler-specific extension. +VTK_ABI_NAMESPACE_BEGIN vtkInstantiateTemplateMacro( extern template class VTKCOMMONCORE_EXPORT vtkScaledSOADataArrayTemplate); #pragma warning(pop) +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkScaledSOADataArrayTemplate.h diff --git a/Common/Core/vtkScaledSOADataArrayTemplate.txx b/Common/Core/vtkScaledSOADataArrayTemplate.txx index 2280a75d79..56cebeab8c 100644 --- a/Common/Core/vtkScaledSOADataArrayTemplate.txx +++ b/Common/Core/vtkScaledSOADataArrayTemplate.txx @@ -30,6 +30,7 @@ #include //----------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN template vtkScaledSOADataArrayTemplate* vtkScaledSOADataArrayTemplate::New() { @@ -371,4 +372,5 @@ void vtkScaledSOADataArrayTemplate::ExportToVoidPointer(void* voidPtr } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkSetGet.h b/Common/Core/vtkSetGet.h index 511f682c88..bc91183f3d 100644 --- a/Common/Core/vtkSetGet.h +++ b/Common/Core/vtkSetGet.h @@ -758,6 +758,7 @@ // This is to avoid vtkObject #include of vtkOutputWindow // while vtkOutputWindow #includes vtkObject +VTK_ABI_NAMESPACE_BEGIN extern VTKCOMMONCORE_EXPORT void vtkOutputWindowDisplayText(const char*); extern VTKCOMMONCORE_EXPORT void vtkOutputWindowDisplayErrorText(const char*); extern VTKCOMMONCORE_EXPORT void vtkOutputWindowDisplayWarningText(const char*); @@ -775,6 +776,7 @@ extern VTKCOMMONCORE_EXPORT void vtkOutputWindowDisplayGenericWarningText( const char*, int, const char*); extern VTKCOMMONCORE_EXPORT void vtkOutputWindowDisplayDebugText( const char*, int, const char*, vtkObject* sourceObj); +VTK_ABI_NAMESPACE_END // // This macro is used for any output that may not be in an instance method diff --git a/Common/Core/vtkShortArray.cxx b/Common/Core/vtkShortArray.cxx index b62b5a4596..c0eba2ac83 100644 --- a/Common/Core/vtkShortArray.cxx +++ b/Common/Core/vtkShortArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(short); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkShortArray); vtkStandardExtendedNewMacro(vtkShortArray); @@ -36,3 +37,4 @@ void vtkShortArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkShortArray.h b/Common/Core/vtkShortArray.h index 0216c18b74..d36095410d 100644 --- a/Common/Core/vtkShortArray.h +++ b/Common/Core/vtkShortArray.h @@ -36,6 +36,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkShortArray : public vtkDataArray { public: @@ -86,4 +87,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkShortArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkSignedCharArray.cxx b/Common/Core/vtkSignedCharArray.cxx index b354e0fee6..dda4f6b318 100644 --- a/Common/Core/vtkSignedCharArray.cxx +++ b/Common/Core/vtkSignedCharArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(signed char); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSignedCharArray); vtkStandardExtendedNewMacro(vtkSignedCharArray); @@ -36,3 +37,4 @@ void vtkSignedCharArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkSignedCharArray.h b/Common/Core/vtkSignedCharArray.h index e6f82c55d3..020fd9941e 100644 --- a/Common/Core/vtkSignedCharArray.h +++ b/Common/Core/vtkSignedCharArray.h @@ -32,6 +32,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkSignedCharArray : public vtkDataArray { public: @@ -82,4 +83,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkSignedCharArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkSmartPointer.h b/Common/Core/vtkSmartPointer.h index 1c9bcc95fb..08e9eae385 100644 --- a/Common/Core/vtkSmartPointer.h +++ b/Common/Core/vtkSmartPointer.h @@ -31,6 +31,7 @@ #include // for is_base_of #include // for std::move +VTK_ABI_NAMESPACE_BEGIN template class vtkSmartPointer : public vtkSmartPointerBase { @@ -330,9 +331,11 @@ VTK_SMART_POINTER_DEFINE_OPERATOR(>) VTK_SMART_POINTER_DEFINE_OPERATOR(>=) #undef VTK_SMART_POINTER_DEFINE_OPERATOR +VTK_ABI_NAMESPACE_END namespace vtk { +VTK_ABI_NAMESPACE_BEGIN /// Construct a vtkSmartPointer containing @a obj. A new reference is added /// to @a obj. @@ -350,8 +353,10 @@ vtkSmartPointer TakeSmartPointer(T* obj) return vtkSmartPointer::Take(obj); } +VTK_ABI_NAMESPACE_END } // end namespace vtk +VTK_ABI_NAMESPACE_BEGIN /** * Streaming operator to print smart pointer like regular pointers. */ @@ -361,5 +366,6 @@ inline ostream& operator<<(ostream& os, const vtkSmartPointer& p) return os << static_cast(p); } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkSmartPointer.h diff --git a/Common/Core/vtkSmartPointerBase.cxx b/Common/Core/vtkSmartPointerBase.cxx index 948fc1f514..9bb0faf207 100644 --- a/Common/Core/vtkSmartPointerBase.cxx +++ b/Common/Core/vtkSmartPointerBase.cxx @@ -17,6 +17,7 @@ #include "vtkGarbageCollector.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkSmartPointerBase::vtkSmartPointerBase() noexcept : Object(nullptr) { @@ -123,3 +124,4 @@ ostream& operator<<(ostream& os, const vtkSmartPointerBase& p) // Just print the pointer value into the stream. return os << static_cast(p.GetPointer()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkSmartPointerBase.h b/Common/Core/vtkSmartPointerBase.h index 691b6ad4e6..b80a36a2de 100644 --- a/Common/Core/vtkSmartPointerBase.h +++ b/Common/Core/vtkSmartPointerBase.h @@ -29,6 +29,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObjectBase.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkSmartPointerBase { public: @@ -135,5 +136,6 @@ VTK_SMART_POINTER_BASE_DEFINE_OPERATOR(>=) */ VTKCOMMONCORE_EXPORT ostream& operator<<(ostream& os, const vtkSmartPointerBase& p); +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkSmartPointerBase.h diff --git a/Common/Core/vtkSortDataArray.cxx b/Common/Core/vtkSortDataArray.cxx index 06e2291cb0..cf18f8fe9c 100644 --- a/Common/Core/vtkSortDataArray.cxx +++ b/Common/Core/vtkSortDataArray.cxx @@ -37,6 +37,7 @@ //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSortDataArray); //------------------------------------------------------------------------------ @@ -98,6 +99,7 @@ void vtkSortDataArray::Sort(vtkAbstractArray* keys, int dir) } } } +VTK_ABI_NAMESPACE_END //------------------------------------------------------------------------------ // Hide some stuff; mostly things plugged into templated functions @@ -210,6 +212,7 @@ void ShuffleTuples( } // anonymous namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // Allocate and initialize sort indices vtkIdType* vtkSortDataArray::InitializeSortIndices(vtkIdType num) @@ -463,3 +466,4 @@ void vtkSortDataArray::PrintSelf(ostream& os, vtkIndent indent) } // vtkSortDataArray methods ------------------------------------------------------- +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkSortDataArray.h b/Common/Core/vtkSortDataArray.h index df3271b0eb..91b9099067 100644 --- a/Common/Core/vtkSortDataArray.h +++ b/Common/Core/vtkSortDataArray.h @@ -69,6 +69,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkAbstractArray; @@ -198,4 +199,5 @@ private: void operator=(const vtkSortDataArray&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkSortDataArray_h diff --git a/Common/Core/vtkSparseArray.h b/Common/Core/vtkSparseArray.h index 7f7c7212bb..098cd83e50 100644 --- a/Common/Core/vtkSparseArray.h +++ b/Common/Core/vtkSparseArray.h @@ -71,6 +71,7 @@ #include "vtkObjectFactory.h" #include "vtkTypedArray.h" +VTK_ABI_NAMESPACE_BEGIN template class vtkSparseArray : public vtkTypedArray { @@ -254,6 +255,7 @@ private: ///@} }; +VTK_ABI_NAMESPACE_END #include "vtkSparseArray.txx" #endif diff --git a/Common/Core/vtkSparseArray.txx b/Common/Core/vtkSparseArray.txx index 569600faa1..7a90258cf7 100644 --- a/Common/Core/vtkSparseArray.txx +++ b/Common/Core/vtkSparseArray.txx @@ -25,6 +25,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN template vtkSparseArray* vtkSparseArray::New() { @@ -613,4 +614,5 @@ vtkStdString vtkSparseArray::InternalGetDimensionLabel(DimensionT i) return this->DimensionLabels[i]; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkStdString.cxx b/Common/Core/vtkStdString.cxx index 689b14decf..2c5ab70f61 100644 --- a/Common/Core/vtkStdString.cxx +++ b/Common/Core/vtkStdString.cxx @@ -15,7 +15,9 @@ #include "vtkStdString.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN ostream& operator<<(ostream& os, const vtkStdString& s) { return os << s.c_str(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkStdString.h b/Common/Core/vtkStdString.h index 7397cd6460..79242344e6 100644 --- a/Common/Core/vtkStdString.h +++ b/Common/Core/vtkStdString.h @@ -30,6 +30,7 @@ #include // For the superclass. #include // For std::move +VTK_ABI_NAMESPACE_BEGIN class vtkStdString; VTKCOMMONCORE_EXPORT ostream& operator<<(ostream&, const vtkStdString&); @@ -77,5 +78,6 @@ public: operator const char*() { return this->c_str(); } }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkStdString.h diff --git a/Common/Core/vtkStringArray.cxx b/Common/Core/vtkStringArray.cxx index 13db2aef55..dc91af353f 100644 --- a/Common/Core/vtkStringArray.cxx +++ b/Common/Core/vtkStringArray.cxx @@ -39,6 +39,7 @@ // since we last build the vtkStringArrayLookup. typedef std::multimap vtkStringCachedUpdates; +VTK_ABI_NAMESPACE_BEGIN namespace { auto DefaultDeleteFunction = [](void* ptr) { delete[] reinterpret_cast(ptr); }; @@ -1032,3 +1033,4 @@ void vtkStringArray::LookupValue(const char* value, vtkIdList* ids) } //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkStringArray.h b/Common/Core/vtkStringArray.h index 927d3d9428..1f523d25ba 100644 --- a/Common/Core/vtkStringArray.h +++ b/Common/Core/vtkStringArray.h @@ -31,6 +31,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkStdString.h" // needed for vtkStdString definition +VTK_ABI_NAMESPACE_BEGIN class vtkStringArrayLookup; class VTKCOMMONCORE_EXPORT vtkStringArray : public vtkAbstractArray @@ -369,4 +370,5 @@ private: void UpdateLookup(); }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkStringOutputWindow.cxx b/Common/Core/vtkStringOutputWindow.cxx index 872353d897..d04d92f672 100644 --- a/Common/Core/vtkStringOutputWindow.cxx +++ b/Common/Core/vtkStringOutputWindow.cxx @@ -15,6 +15,7 @@ #include "vtkStringOutputWindow.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStringOutputWindow); vtkStringOutputWindow::vtkStringOutputWindow() @@ -45,3 +46,4 @@ void vtkStringOutputWindow::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkStringOutputWindow.h b/Common/Core/vtkStringOutputWindow.h index a04ae74139..1a7927727f 100644 --- a/Common/Core/vtkStringOutputWindow.h +++ b/Common/Core/vtkStringOutputWindow.h @@ -28,6 +28,7 @@ #include "vtkOutputWindow.h" #include // for ivar +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkStringOutputWindow : public vtkOutputWindow { public: @@ -60,4 +61,5 @@ private: void operator=(const vtkStringOutputWindow&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkTestDataArray.h b/Common/Core/vtkTestDataArray.h index 526c4a8a40..ba3a021967 100644 --- a/Common/Core/vtkTestDataArray.h +++ b/Common/Core/vtkTestDataArray.h @@ -33,6 +33,7 @@ #include "vtkGenericDataArray.h" #include "vtkObjectFactory.h" // For VTK_STANDARD_NEW_BODY +VTK_ABI_NAMESPACE_BEGIN template class vtkTestDataArray : public vtkGenericDataArray, typename ArrayT::ValueType> @@ -94,5 +95,6 @@ private: void operator=(const vtkTestDataArray&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkTestDataArray.h diff --git a/Common/Core/vtkTimePointUtility.cxx b/Common/Core/vtkTimePointUtility.cxx index 6a3dce6ab1..2c30225e39 100644 --- a/Common/Core/vtkTimePointUtility.cxx +++ b/Common/Core/vtkTimePointUtility.cxx @@ -26,6 +26,7 @@ #include // C++ locale #include +VTK_ABI_NAMESPACE_BEGIN const int vtkTimePointUtility::MILLIS_PER_SECOND = 1000; const int vtkTimePointUtility::MILLIS_PER_MINUTE = 60000; const int vtkTimePointUtility::MILLIS_PER_HOUR = 3600000; @@ -419,3 +420,4 @@ const char* vtkTimePointUtility::TimePointToISO8601(vtkTypeUInt64 time, int form strcpy(copy, oss.str().c_str()); return copy; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkTimePointUtility.h b/Common/Core/vtkTimePointUtility.h index 3b46f3ae4b..81e54ff031 100644 --- a/Common/Core/vtkTimePointUtility.h +++ b/Common/Core/vtkTimePointUtility.h @@ -31,6 +31,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkTimePointUtility : public vtkObject { public: @@ -167,4 +168,5 @@ private: void operator=(const vtkTimePointUtility&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkTimeStamp.cxx b/Common/Core/vtkTimeStamp.cxx index 636a81d072..2416b3d029 100644 --- a/Common/Core/vtkTimeStamp.cxx +++ b/Common/Core/vtkTimeStamp.cxx @@ -20,6 +20,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkTimeStamp* vtkTimeStamp::New() { // If the factory was unable to create the object, then create it here. @@ -55,3 +56,4 @@ void vtkTimeStamp::Modified() #endif this->ModifiedTime = (vtkMTimeType)++GlobalTimeStamp; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkTimeStamp.h b/Common/Core/vtkTimeStamp.h index d5c42be4d9..8494997a1b 100644 --- a/Common/Core/vtkTimeStamp.h +++ b/Common/Core/vtkTimeStamp.h @@ -29,6 +29,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkTimeStamp { public: @@ -70,5 +71,6 @@ private: vtkMTimeType ModifiedTime; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkTimeStamp.h diff --git a/Common/Core/vtkType.h b/Common/Core/vtkType.h index a1bb15cc5f..52fc1af73b 100644 --- a/Common/Core/vtkType.h +++ b/Common/Core/vtkType.h @@ -15,6 +15,7 @@ #ifndef vtkType_h #define vtkType_h +#include "vtkABINamespace.h" #include "vtkCompiler.h" // for VTK_USE_EXTERN_TEMPLATE #include "vtkOptions.h" // for VTK_USE_64BIT_IDS and VTK_USE_64BIT_TIMESTAMPS #include "vtk_kwiml.h" @@ -359,11 +360,13 @@ typedef bool vtkTypeUBool; * is intended to handle vtkIdType, which does not have the same tag as its * underlying data type. * @note This method is only available when included from a C++ source file. */ +VTK_ABI_NAMESPACE_BEGIN inline vtkTypeBool vtkDataTypesCompare(int a, int b) { return (a == b || ((a == VTK_ID_TYPE || a == VTK_ID_TYPE_IMPL) && (b == VTK_ID_TYPE || b == VTK_ID_TYPE_IMPL))); } +VTK_ABI_NAMESPACE_END #endif /*--------------------------------------------------------------------------*/ diff --git a/Common/Core/vtkTypeList.h b/Common/Core/vtkTypeList.h index c4f141d684..95290459a5 100644 --- a/Common/Core/vtkTypeList.h +++ b/Common/Core/vtkTypeList.h @@ -50,10 +50,12 @@ #ifndef vtkTypeList_h #define vtkTypeList_h +#include "vtkABINamespace.h" #include "vtkTypeListMacros.h" namespace vtkTypeList { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ /** @@ -163,16 +165,19 @@ struct DerivedToFront; template struct Append; +VTK_ABI_NAMESPACE_END } // end namespace vtkTypeList #include "vtkTypeList.txx" namespace vtkTypeList { +VTK_ABI_NAMESPACE_BEGIN template using Create = typename vtkTypeList::detail::CreateImpl::type; +VTK_ABI_NAMESPACE_END } // end namespace vtkTypeList #endif // vtkTypeList_h diff --git a/Common/Core/vtkTypeList.txx b/Common/Core/vtkTypeList.txx index 3bdbdd185d..0728e00923 100644 --- a/Common/Core/vtkTypeList.txx +++ b/Common/Core/vtkTypeList.txx @@ -20,9 +20,9 @@ namespace vtkTypeList { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN template struct CreateImpl; @@ -64,8 +64,11 @@ struct CreateImpl vtkTypeList::TypeList::type>>>>; }; +VTK_ABI_NAMESPACE_END } +VTK_ABI_NAMESPACE_BEGIN + //------------------------------------------------------------------------------ // Description: // Sets Result to T if Exp is true, or F if Exp is false. @@ -377,6 +380,7 @@ struct Append, T> typedef vtkTypeList::TypeList::Result> Result; }; +VTK_ABI_NAMESPACE_END } #endif // vtkTypeList_txx diff --git a/Common/Core/vtkTypeTraits.h b/Common/Core/vtkTypeTraits.h index c768a6b938..b669321fd5 100644 --- a/Common/Core/vtkTypeTraits.h +++ b/Common/Core/vtkTypeTraits.h @@ -26,6 +26,7 @@ #include "vtkSystemIncludes.h" // Forward-declare template. There is no primary template. +VTK_ABI_NAMESPACE_BEGIN template struct vtkTypeTraits; @@ -153,5 +154,6 @@ VTK_TYPE_TRAITS(unsigned long long, UNSIGNED_LONG_LONG, 0, UInt64, unsigned long #undef VTK_TYPE_TRAITS +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkTypeTraits.h diff --git a/Common/Core/vtkTypedArray.cxx.in b/Common/Core/vtkTypedArray.cxx.in index e61d9bd847..c829626f30 100644 --- a/Common/Core/vtkTypedArray.cxx.in +++ b/Common/Core/vtkTypedArray.cxx.in @@ -17,6 +17,7 @@ #include "vtkObjectFactory.h" //---------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkType@VTK_TYPE_NAME@Array); //---------------------------------------------------------------------------- @@ -30,3 +31,4 @@ void vtkType@VTK_TYPE_NAME@Array::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os,indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkTypedArray.h b/Common/Core/vtkTypedArray.h index 1f119f6f25..3b28d38863 100644 --- a/Common/Core/vtkTypedArray.h +++ b/Common/Core/vtkTypedArray.h @@ -49,6 +49,7 @@ #include "vtkArray.h" +VTK_ABI_NAMESPACE_BEGIN class vtkArrayCoordinates; template @@ -128,6 +129,7 @@ private: void operator=(const vtkTypedArray&) = delete; }; +VTK_ABI_NAMESPACE_END #include "vtkTypedArray.txx" #endif diff --git a/Common/Core/vtkTypedArray.h.in b/Common/Core/vtkTypedArray.h.in index 2350c830db..af6b1d1703 100644 --- a/Common/Core/vtkTypedArray.h.in +++ b/Common/Core/vtkTypedArray.h.in @@ -29,6 +29,9 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkType.h" // For native type selections. @VTK_TYPE_NATIVE@ + +VTK_ABI_NAMESPACE_BEGIN + class VTKCOMMONCORE_EXPORT vtkType@VTK_TYPE_NAME@Array : public vtkTypeArrayBase { public: @@ -55,6 +58,9 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkType@VTK_TYPE_NAME@Array); +VTK_ABI_NAMESPACE_END + #undef vtkTypeArrayBase #endif +/* VTK-HeaderTest-Exclude: INCLUDES */ diff --git a/Common/Core/vtkTypedArray.txx b/Common/Core/vtkTypedArray.txx index df1940c670..066808c468 100644 --- a/Common/Core/vtkTypedArray.txx +++ b/Common/Core/vtkTypedArray.txx @@ -22,6 +22,7 @@ #include "vtkVariantCast.h" #include "vtkVariantCreate.h" +VTK_ABI_NAMESPACE_BEGIN template void vtkTypedArray::PrintSelf(ostream& os, vtkIndent indent) { @@ -94,3 +95,4 @@ void vtkTypedArray::CopyValue( this->SetValueN( target_index, static_cast*>(source)->GetValue(source_coordinates)); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkTypedDataArray.h b/Common/Core/vtkTypedDataArray.h index b0a8f74850..327cd41fa1 100644 --- a/Common/Core/vtkTypedDataArray.h +++ b/Common/Core/vtkTypedDataArray.h @@ -41,6 +41,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkTypeTraits.h" // For type metadata +VTK_ABI_NAMESPACE_BEGIN template class vtkTypedDataArrayIterator; @@ -184,8 +185,10 @@ private: vtkArrayDownCast_TemplateFastCastMacro(vtkTypedDataArray); // Included here to resolve chicken/egg issue with container/iterator: +VTK_ABI_NAMESPACE_END #include "vtkTypedDataArrayIterator.h" // For iterator +VTK_ABI_NAMESPACE_BEGIN template inline typename vtkTypedDataArray::Iterator vtkTypedDataArray::Begin() { @@ -198,6 +201,7 @@ inline typename vtkTypedDataArray::Iterator vtkTypedDataArray::E return Iterator(this, this->MaxId + 1); } +VTK_ABI_NAMESPACE_END #include "vtkTypedDataArray.txx" #endif // vtkTypedDataArray_h diff --git a/Common/Core/vtkTypedDataArray.txx b/Common/Core/vtkTypedDataArray.txx index 868b02c3c6..b72bdb4be9 100644 --- a/Common/Core/vtkTypedDataArray.txx +++ b/Common/Core/vtkTypedDataArray.txx @@ -19,6 +19,7 @@ #include "vtkTypedDataArray.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN template vtkTypedDataArray::vtkTypedDataArray() = default; @@ -95,4 +96,5 @@ inline vtkTypedDataArray* vtkTypedDataArray::FastDownCast(vtkAbs return nullptr; } +VTK_ABI_NAMESPACE_END #endif // vtkTypedDataArray_txx diff --git a/Common/Core/vtkTypedDataArrayIterator.h b/Common/Core/vtkTypedDataArrayIterator.h index 1ba6997a35..6505be8d27 100644 --- a/Common/Core/vtkTypedDataArrayIterator.h +++ b/Common/Core/vtkTypedDataArrayIterator.h @@ -37,6 +37,7 @@ #include "vtkTypedDataArray.h" // For vtkTypedDataArray +VTK_ABI_NAMESPACE_BEGIN template class vtkTypedDataArrayIterator { @@ -165,6 +166,7 @@ private: vtkIdType Index; }; +VTK_ABI_NAMESPACE_END #endif // vtkTypedDataArrayIterator_h // VTK-HeaderTest-Exclude: vtkTypedDataArrayIterator.h diff --git a/Common/Core/vtkUnsignedCharArray.cxx b/Common/Core/vtkUnsignedCharArray.cxx index f002204b07..94a8467663 100644 --- a/Common/Core/vtkUnsignedCharArray.cxx +++ b/Common/Core/vtkUnsignedCharArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned char); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUnsignedCharArray); vtkStandardExtendedNewMacro(vtkUnsignedCharArray); @@ -36,3 +37,4 @@ void vtkUnsignedCharArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkUnsignedCharArray.h b/Common/Core/vtkUnsignedCharArray.h index fcaf2f1766..b38503b63c 100644 --- a/Common/Core/vtkUnsignedCharArray.h +++ b/Common/Core/vtkUnsignedCharArray.h @@ -32,6 +32,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkUnsignedCharArray : public vtkDataArray { public: @@ -82,4 +83,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkUnsignedCharArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkUnsignedIntArray.cxx b/Common/Core/vtkUnsignedIntArray.cxx index a68c7d85fd..81ed024873 100644 --- a/Common/Core/vtkUnsignedIntArray.cxx +++ b/Common/Core/vtkUnsignedIntArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned int); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUnsignedIntArray); vtkStandardExtendedNewMacro(vtkUnsignedIntArray); @@ -36,3 +37,4 @@ void vtkUnsignedIntArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkUnsignedIntArray.h b/Common/Core/vtkUnsignedIntArray.h index f5f24e6df5..dc26712324 100644 --- a/Common/Core/vtkUnsignedIntArray.h +++ b/Common/Core/vtkUnsignedIntArray.h @@ -36,6 +36,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkUnsignedIntArray : public vtkDataArray { public: @@ -86,4 +87,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkUnsignedIntArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkUnsignedLongArray.cxx b/Common/Core/vtkUnsignedLongArray.cxx index c123f80b69..b8cda7cee8 100644 --- a/Common/Core/vtkUnsignedLongArray.cxx +++ b/Common/Core/vtkUnsignedLongArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned long); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUnsignedLongArray); vtkStandardExtendedNewMacro(vtkUnsignedLongArray); @@ -36,3 +37,4 @@ void vtkUnsignedLongArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkUnsignedLongArray.h b/Common/Core/vtkUnsignedLongArray.h index 7d5ef1f252..e968631243 100644 --- a/Common/Core/vtkUnsignedLongArray.h +++ b/Common/Core/vtkUnsignedLongArray.h @@ -38,6 +38,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkUnsignedLongArray : public vtkDataArray { public: @@ -88,4 +89,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkUnsignedLongArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkUnsignedLongLongArray.cxx b/Common/Core/vtkUnsignedLongLongArray.cxx index 3c67e34ab5..fce7befe23 100644 --- a/Common/Core/vtkUnsignedLongLongArray.cxx +++ b/Common/Core/vtkUnsignedLongLongArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned long long); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUnsignedLongLongArray); vtkStandardExtendedNewMacro(vtkUnsignedLongLongArray); @@ -36,3 +37,4 @@ void vtkUnsignedLongLongArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkUnsignedLongLongArray.h b/Common/Core/vtkUnsignedLongLongArray.h index 5a576627b0..705dfe3477 100644 --- a/Common/Core/vtkUnsignedLongLongArray.h +++ b/Common/Core/vtkUnsignedLongLongArray.h @@ -36,6 +36,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkUnsignedLongLongArray : public vtkDataArray { public: @@ -86,4 +87,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkUnsignedLongLongArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkUnsignedShortArray.cxx b/Common/Core/vtkUnsignedShortArray.cxx index d40b0b23db..1a2ee76f98 100644 --- a/Common/Core/vtkUnsignedShortArray.cxx +++ b/Common/Core/vtkUnsignedShortArray.cxx @@ -22,6 +22,7 @@ VTK_AOS_DATA_ARRAY_TEMPLATE_INSTANTIATE(unsigned short); #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUnsignedShortArray); vtkStandardExtendedNewMacro(vtkUnsignedShortArray); @@ -36,3 +37,4 @@ void vtkUnsignedShortArray::PrintSelf(ostream& os, vtkIndent indent) { this->RealSuperclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkUnsignedShortArray.h b/Common/Core/vtkUnsignedShortArray.h index 40a1f1f6ad..76a4d9c833 100644 --- a/Common/Core/vtkUnsignedShortArray.h +++ b/Common/Core/vtkUnsignedShortArray.h @@ -36,6 +36,7 @@ #ifndef __VTK_WRAP__ #define vtkDataArray vtkAOSDataArrayTemplate #endif +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkUnsignedShortArray : public vtkDataArray { public: @@ -86,4 +87,5 @@ private: // Define vtkArrayDownCast implementation: vtkArrayDownCast_FastCastMacro(vtkUnsignedShortArray); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkVTK_USE_SCALED_SOA_ARRAYS.h.in b/Common/Core/vtkVTK_USE_SCALED_SOA_ARRAYS.h.in index 9d3bf29dcb..103786119c 100644 --- a/Common/Core/vtkVTK_USE_SCALED_SOA_ARRAYS.h.in +++ b/Common/Core/vtkVTK_USE_SCALED_SOA_ARRAYS.h.in @@ -13,5 +13,10 @@ =========================================================================*/ +#ifndef vtkVTK_USE_SCALED_SOA_ARRAYS_h +#define vtkVTK_USE_SCALED_SOA_ARRAYS_h + // defined if VTK provides the vtkScaledSOADataArray classes #cmakedefine VTK_USE_SCALED_SOA_ARRAYS + +#endif // vtkVTK_USE_SCALED_SOA_ARRAYS_h diff --git a/Common/Core/vtkVariant.cxx b/Common/Core/vtkVariant.cxx index 70bae934d3..753334f8bb 100644 --- a/Common/Core/vtkVariant.cxx +++ b/Common/Core/vtkVariant.cxx @@ -39,6 +39,7 @@ // Implementation of vtkVariant's // fast-but-potentially-counterintuitive < operation +VTK_ABI_NAMESPACE_BEGIN bool vtkVariantStrictWeakOrder::operator()(const vtkVariant& s1, const vtkVariant& s2) const { // First sort on type if they are different @@ -853,6 +854,7 @@ T vtkVariantStringToNumeric(vtkStdString str, bool* valid, T* vtkNotUsed(ignored // Definition of ToNumeric // NOLINTNEXTLINE(bugprone-suspicious-include) +VTK_ABI_NAMESPACE_END #include "vtkVariantToNumeric.cxx" //------------------------------------------------------------------------------ @@ -864,6 +866,7 @@ T vtkVariantStringToNumeric(vtkStdString str, bool* valid, T* vtkNotUsed(ignored #define vtkVariantToNumericInstantiateMacro(x) template x vtkVariant::ToNumeric(bool*, x*) const +VTK_ABI_NAMESPACE_BEGIN vtkVariantToNumericInstantiateMacro(char); vtkVariantToNumericInstantiateMacro(float); vtkVariantToNumericInstantiateMacro(double); @@ -878,11 +881,13 @@ vtkVariantToNumericInstantiateMacro(unsigned long); vtkVariantToNumericInstantiateMacro(long long); vtkVariantToNumericInstantiateMacro(unsigned long long); +VTK_ABI_NAMESPACE_END #endif //------------------------------------------------------------------------------ // Callers causing implicit instantiations of ToNumeric +VTK_ABI_NAMESPACE_BEGIN float vtkVariant::ToFloat(bool* valid) const { return this->ToNumeric(valid, static_cast(nullptr)); @@ -1034,3 +1039,4 @@ ostream& operator<<(ostream& os, const vtkVariant& val) } return os; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkVariant.h b/Common/Core/vtkVariant.h index 2459756801..4dd411aa5e 100644 --- a/Common/Core/vtkVariant.h +++ b/Common/Core/vtkVariant.h @@ -52,6 +52,7 @@ vtkArrayIteratorTemplateMacro(call); \ vtkArrayIteratorTemplateMacroCase(VTK_VARIANT, vtkVariant, call) +VTK_ABI_NAMESPACE_BEGIN class vtkStdString; class vtkObjectBase; class vtkAbstractArray; @@ -426,6 +427,7 @@ private: friend struct vtkVariantStrictEquality; }; +VTK_ABI_NAMESPACE_END #include "vtkVariantInlineOperators.h" // needed for operator== and company // A STL-style function object so you can compare two variants using @@ -434,6 +436,7 @@ private: // compare values. It satisfies the STL requirement for a comparison // function for ordered containers like map and set. +VTK_ABI_NAMESPACE_BEGIN struct VTKCOMMONCORE_EXPORT vtkVariantLessThan { public: @@ -461,5 +464,6 @@ public: bool operator()(const vtkVariant& s1, const vtkVariant& s2) const; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkVariant.h diff --git a/Common/Core/vtkVariantArray.cxx b/Common/Core/vtkVariantArray.cxx index cf4cf1ea87..c213138f7f 100644 --- a/Common/Core/vtkVariantArray.cxx +++ b/Common/Core/vtkVariantArray.cxx @@ -47,6 +47,7 @@ namespace { auto DefaultDeleteFunction = [](void* ptr) { delete[] reinterpret_cast(ptr); }; } +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ class vtkVariantArrayLookup @@ -1040,3 +1041,4 @@ void vtkVariantArray::ClearLookup() delete this->Lookup; this->Lookup = nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkVariantArray.h b/Common/Core/vtkVariantArray.h index ae980f65aa..3635d8fba0 100644 --- a/Common/Core/vtkVariantArray.h +++ b/Common/Core/vtkVariantArray.h @@ -35,8 +35,6 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkVariant.h" // For variant type -class vtkVariantArrayLookup; - /// Forward declaration required for Boost serialization namespace boost { @@ -46,6 +44,9 @@ class access; } } +VTK_ABI_NAMESPACE_BEGIN +class vtkVariantArrayLookup; + class VTKCOMMONCORE_EXPORT vtkVariantArray : public vtkAbstractArray { @@ -351,4 +352,5 @@ private: void UpdateLookup(); }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkVariantCast.h b/Common/Core/vtkVariantCast.h index 2101c5c777..7d429b70b0 100644 --- a/Common/Core/vtkVariantCast.h +++ b/Common/Core/vtkVariantCast.h @@ -39,6 +39,7 @@ #include "vtkVariant.h" #include // for warnings +VTK_ABI_NAMESPACE_BEGIN template T vtkVariantCast(const vtkVariant& value, bool* valid = nullptr) { @@ -150,6 +151,7 @@ inline vtkVariant vtkVariantCast(const vtkVariant& value, bool* vali return value; } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkVariantCast.h diff --git a/Common/Core/vtkVariantCreate.h b/Common/Core/vtkVariantCreate.h index e04d3514d5..bab5bca13a 100644 --- a/Common/Core/vtkVariantCreate.h +++ b/Common/Core/vtkVariantCreate.h @@ -35,6 +35,7 @@ #include "vtkVariant.h" #include // for warnings +VTK_ABI_NAMESPACE_BEGIN template vtkVariant vtkVariantCreate(const T&) { @@ -129,6 +130,7 @@ inline vtkVariant vtkVariantCreate(const vtkVariant& value) return value; } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkVariantCreate.h diff --git a/Common/Core/vtkVariantExtract.h b/Common/Core/vtkVariantExtract.h index 87db266c59..9d458ffdfa 100644 --- a/Common/Core/vtkVariantExtract.h +++ b/Common/Core/vtkVariantExtract.h @@ -38,6 +38,7 @@ #include "vtkVariant.h" #include // for typeid +VTK_ABI_NAMESPACE_BEGIN template T vtkVariantExtract(const vtkVariant& value, bool& valid) { @@ -151,6 +152,7 @@ inline vtkVariant vtkVariantExtract(const vtkVariant& value, bool& v return value; } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkVariantExtract.h diff --git a/Common/Core/vtkVariantInlineOperators.h b/Common/Core/vtkVariantInlineOperators.h index 6b663515d7..2114bdd90e 100644 --- a/Common/Core/vtkVariantInlineOperators.h +++ b/Common/Core/vtkVariantInlineOperators.h @@ -1,6 +1,8 @@ #ifndef vtkVariantInlineOperators_h #define vtkVariantInlineOperators_h +#include "vtkABINamespace.h" + #include // ---------------------------------------------------------------------- @@ -9,6 +11,7 @@ // type we're actually dealing with. With any luck the compiler will // inline these so they have very little overhead. +VTK_ABI_NAMESPACE_BEGIN inline bool IsSigned64Bit(int VariantType) { return ((VariantType == VTK_LONG_LONG) || (VariantType == VTK_TYPE_INT64)); @@ -245,5 +248,6 @@ inline bool vtkVariant::operator>=(const vtkVariant& other) const return (!this->operator<(other)); } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkVariantInlineOperators.h diff --git a/Common/Core/vtkVariantToNumeric.cxx b/Common/Core/vtkVariantToNumeric.cxx index 33d0f099bd..bb7e3aa90c 100644 --- a/Common/Core/vtkVariantToNumeric.cxx +++ b/Common/Core/vtkVariantToNumeric.cxx @@ -23,6 +23,7 @@ // allow it to be defined before its use with most compilers, but after its // use for (at least) Visual Studio 6. +VTK_ABI_NAMESPACE_BEGIN template T vtkVariant::ToNumeric(bool* valid, T* vtkNotUsed(ignored)) const { @@ -117,3 +118,4 @@ T vtkVariant::ToNumeric(bool* valid, T* vtkNotUsed(ignored)) const } return static_cast(0); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkVersion.cxx b/Common/Core/vtkVersion.cxx index ce7d4f149b..61c357fb0e 100644 --- a/Common/Core/vtkVersion.cxx +++ b/Common/Core/vtkVersion.cxx @@ -16,6 +16,7 @@ #include "vtkObjectFactory.h" #include "vtkVersionFull.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkVersion); void vtkVersion::PrintSelf(ostream& os, vtkIndent indent) @@ -34,3 +35,4 @@ const char* GetVTKVersion() { return vtkVersion::GetVTKVersion(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkVersion.h b/Common/Core/vtkVersion.h index bcd27ec5c0..5824777f81 100644 --- a/Common/Core/vtkVersion.h +++ b/Common/Core/vtkVersion.h @@ -31,6 +31,7 @@ #include "vtkObject.h" #include "vtkVersionMacros.h" // For version macros +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkVersion : public vtkObject { public: @@ -64,4 +65,5 @@ extern "C" VTKCOMMONCORE_EXPORT const char* GetVTKVersion(); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkVoidArray.cxx b/Common/Core/vtkVoidArray.cxx index dea3cf7fc0..62e64ddcfd 100644 --- a/Common/Core/vtkVoidArray.cxx +++ b/Common/Core/vtkVoidArray.cxx @@ -15,6 +15,7 @@ #include "vtkVoidArray.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkVoidArray); vtkStandardExtendedNewMacro(vtkVoidArray); @@ -176,3 +177,4 @@ void vtkVoidArray::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Array: (null)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkVoidArray.h b/Common/Core/vtkVoidArray.h index b18e9f4f44..96d9a2b4f9 100644 --- a/Common/Core/vtkVoidArray.h +++ b/Common/Core/vtkVoidArray.h @@ -27,6 +27,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkVoidArray : public vtkObject { public: @@ -140,4 +141,5 @@ private: void operator=(const vtkVoidArray&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkWeakPointer.h b/Common/Core/vtkWeakPointer.h index ba6c0054c3..58e3a00234 100644 --- a/Common/Core/vtkWeakPointer.h +++ b/Common/Core/vtkWeakPointer.h @@ -51,6 +51,7 @@ #include // for is_base_of #include // for std::move +VTK_ABI_NAMESPACE_BEGIN template class vtkWeakPointer : public vtkWeakPointerBase { @@ -291,8 +292,11 @@ VTK_WEAK_POINTER_DEFINE_OPERATOR(>=) #undef VTK_WEAK_POINTER_DEFINE_OPERATOR +VTK_ABI_NAMESPACE_END + namespace vtk { +VTK_ABI_NAMESPACE_BEGIN /// Construct a vtkWeakPointer containing @a obj. @a obj's reference count /// is not changed. @@ -302,8 +306,10 @@ vtkWeakPointer TakeWeakPointer(T* obj) return vtkWeakPointer(obj); } +VTK_ABI_NAMESPACE_END } // end namespace vtk +VTK_ABI_NAMESPACE_BEGIN /** * Streaming operator to print smart pointer like regular pointers. */ @@ -313,6 +319,7 @@ inline ostream& operator<<(ostream& os, const vtkWeakPointer& p) return os << static_cast(p); } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkWeakPointer.h diff --git a/Common/Core/vtkWeakPointerBase.cxx b/Common/Core/vtkWeakPointerBase.cxx index 1fe8f46f5e..08889562a1 100644 --- a/Common/Core/vtkWeakPointerBase.cxx +++ b/Common/Core/vtkWeakPointerBase.cxx @@ -15,6 +15,7 @@ #include "vtkWeakPointerBase.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN class vtkWeakPointerBaseToObjectBaseFriendship { public: @@ -203,3 +204,4 @@ ostream& operator<<(ostream& os, const vtkWeakPointerBase& p) // Just print the pointer value into the stream. return os << static_cast(p.GetPointer()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkWeakPointerBase.h b/Common/Core/vtkWeakPointerBase.h index d35c3ff83d..006375ca90 100644 --- a/Common/Core/vtkWeakPointerBase.h +++ b/Common/Core/vtkWeakPointerBase.h @@ -28,6 +28,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObjectBase.h" +VTK_ABI_NAMESPACE_BEGIN class vtkObjectBaseToWeakPointerBaseFriendship; class VTKCOMMONCORE_EXPORT vtkWeakPointerBase @@ -126,5 +127,6 @@ VTK_WEAK_POINTER_BASE_DEFINE_OPERATOR(>=) */ VTKCOMMONCORE_EXPORT ostream& operator<<(ostream& os, const vtkWeakPointerBase& p); +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkWeakPointerBase.h diff --git a/Common/Core/vtkWeakReference.cxx b/Common/Core/vtkWeakReference.cxx index f2c64ca5fb..179bc5f7bd 100644 --- a/Common/Core/vtkWeakReference.cxx +++ b/Common/Core/vtkWeakReference.cxx @@ -18,6 +18,7 @@ #include "vtkWeakPointer.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkWeakReference); //------------------------------------------------------------------------------ @@ -37,3 +38,4 @@ vtkObject* vtkWeakReference::Get() { return this->Object; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkWeakReference.h b/Common/Core/vtkWeakReference.h index c8236ba08c..1ff09cd549 100644 --- a/Common/Core/vtkWeakReference.h +++ b/Common/Core/vtkWeakReference.h @@ -28,6 +28,7 @@ #include "vtkObject.h" #include "vtkWeakPointer.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkWeakReference : public vtkObject { public: @@ -50,6 +51,7 @@ private: vtkWeakPointer Object; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkWeakReference.h diff --git a/Common/Core/vtkWin32OutputWindow.cxx b/Common/Core/vtkWin32OutputWindow.cxx index 20ed9393f0..76e5807ccb 100644 --- a/Common/Core/vtkWin32OutputWindow.cxx +++ b/Common/Core/vtkWin32OutputWindow.cxx @@ -20,6 +20,7 @@ #include "vtksys/Encoding.hxx" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkWin32OutputWindow); HWND vtkWin32OutputWindowOutputWindow = 0; @@ -262,3 +263,4 @@ void vtkWin32OutputWindow::PrintSelf(ostream& os, vtkIndent indent) os << indent << "OutputWindow: (null)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkWin32OutputWindow.h b/Common/Core/vtkWin32OutputWindow.h index b4cfb3bfd1..f0dcedf159 100644 --- a/Common/Core/vtkWin32OutputWindow.h +++ b/Common/Core/vtkWin32OutputWindow.h @@ -36,6 +36,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkOutputWindow.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkWin32OutputWindow : public vtkOutputWindow { public: @@ -71,4 +72,5 @@ private: void operator=(const vtkWin32OutputWindow&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkWin32ProcessOutputWindow.cxx b/Common/Core/vtkWin32ProcessOutputWindow.cxx index 41ed845bde..2d560c9343 100644 --- a/Common/Core/vtkWin32ProcessOutputWindow.cxx +++ b/Common/Core/vtkWin32ProcessOutputWindow.cxx @@ -34,6 +34,7 @@ #endif #endif +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkWin32ProcessOutputWindow); extern "C" int vtkEncodedArrayWin32OutputWindowProcessWrite(const char* fname); @@ -174,3 +175,4 @@ void vtkWin32ProcessOutputWindow::Write(const char* data, size_t length) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkWin32ProcessOutputWindow.h b/Common/Core/vtkWin32ProcessOutputWindow.h index 68e9e513cf..8dad2fd13c 100644 --- a/Common/Core/vtkWin32ProcessOutputWindow.h +++ b/Common/Core/vtkWin32ProcessOutputWindow.h @@ -28,6 +28,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkOutputWindow.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkWin32ProcessOutputWindow : public vtkOutputWindow { public: @@ -61,4 +62,5 @@ private: void operator=(const vtkWin32ProcessOutputWindow&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkWindow.cxx b/Common/Core/vtkWindow.cxx index 8ff35e8764..1fd7de7aad 100644 --- a/Common/Core/vtkWindow.cxx +++ b/Common/Core/vtkWindow.cxx @@ -20,6 +20,7 @@ // Construct an instance of vtkRenderWindow with its screen size // set to 300x300, borders turned on, positioned at (0,0), double // buffering turned on. +VTK_ABI_NAMESPACE_BEGIN vtkWindow::vtkWindow() { this->ShowWindow = true; @@ -138,3 +139,4 @@ void vtkWindow::PrintSelf(ostream& os, vtkIndent indent) os << indent << "TileViewport: (" << this->TileViewport[0] << ", " << this->TileViewport[1] << ", " << this->TileViewport[2] << ", " << this->TileViewport[3] << ")\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkWindow.h b/Common/Core/vtkWindow.h index b4a0192d87..137c4e29ff 100644 --- a/Common/Core/vtkWindow.h +++ b/Common/Core/vtkWindow.h @@ -29,6 +29,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkImageData; class vtkUnsignedCharArray; @@ -285,4 +286,5 @@ private: void operator=(const vtkWindow&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/Core/vtkXMLFileOutputWindow.cxx b/Common/Core/vtkXMLFileOutputWindow.cxx index 97db961ab7..277b27d257 100644 --- a/Common/Core/vtkXMLFileOutputWindow.cxx +++ b/Common/Core/vtkXMLFileOutputWindow.cxx @@ -17,6 +17,7 @@ #include "vtksys/Encoding.hxx" #include "vtksys/FStream.hxx" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkXMLFileOutputWindow); void vtkXMLFileOutputWindow::PrintSelf(ostream& os, vtkIndent indent) @@ -150,3 +151,4 @@ void vtkXMLFileOutputWindow::DisplayDebugText(const char* text) { this->DisplayXML("Debug", text); } +VTK_ABI_NAMESPACE_END diff --git a/Common/Core/vtkXMLFileOutputWindow.h b/Common/Core/vtkXMLFileOutputWindow.h index 748e7fdc64..02d0b77b18 100644 --- a/Common/Core/vtkXMLFileOutputWindow.h +++ b/Common/Core/vtkXMLFileOutputWindow.h @@ -40,6 +40,7 @@ #include "vtkCommonCoreModule.h" // For export macro #include "vtkFileOutputWindow.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONCORE_EXPORT vtkXMLFileOutputWindow : public vtkFileOutputWindow { public: @@ -78,4 +79,5 @@ private: void operator=(const vtkXMLFileOutputWindow&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAMRBox.cxx b/Common/DataModel/vtkAMRBox.cxx index 7a7ab2e099..ffd37c55ce 100644 --- a/Common/DataModel/vtkAMRBox.cxx +++ b/Common/DataModel/vtkAMRBox.cxx @@ -28,6 +28,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkAMRBox::vtkAMRBox() { this->Initialize(); @@ -742,3 +743,4 @@ void vtkAMRBox::Shrink(int byN) } assert("post: Grown AMR Box instance is invalid" && !this->IsInvalid()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAMRBox.h b/Common/DataModel/vtkAMRBox.h index 6112b10cf7..5694d373b4 100644 --- a/Common/DataModel/vtkAMRBox.h +++ b/Common/DataModel/vtkAMRBox.h @@ -30,6 +30,7 @@ #include "vtkObject.h" #include "vtkStructuredData.h" // For VTK_XYZ_GRID definition +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkAMRBox { public: @@ -388,5 +389,6 @@ void FillRegion(T* pArray, const vtkAMRBox& arrayRegion, const vtkAMRBox& destRe ///@} } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkAMRBox.h diff --git a/Common/DataModel/vtkAMRDataInternals.cxx b/Common/DataModel/vtkAMRDataInternals.cxx index 29875df6d6..0c8e74c280 100644 --- a/Common/DataModel/vtkAMRDataInternals.cxx +++ b/Common/DataModel/vtkAMRDataInternals.cxx @@ -17,6 +17,7 @@ #include "vtkUniformGrid.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAMRDataInternals); vtkAMRDataInternals::Block::Block(unsigned int i, vtkUniformGrid* g) @@ -146,3 +147,4 @@ void vtkAMRDataInternals::RecursiveShallowCopy(vtkObject* src) this->Modified(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAMRDataInternals.h b/Common/DataModel/vtkAMRDataInternals.h index e8c763b270..9acd5e45ca 100644 --- a/Common/DataModel/vtkAMRDataInternals.h +++ b/Common/DataModel/vtkAMRDataInternals.h @@ -31,6 +31,7 @@ #include "vtkSmartPointer.h" //for storing smart pointers to blocks #include //for storing blocks +VTK_ABI_NAMESPACE_BEGIN class vtkUniformGrid; class VTKCOMMONDATAMODEL_EXPORT vtkAMRDataInternals : public vtkObject { @@ -77,4 +78,5 @@ private: void operator=(const vtkAMRDataInternals&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAMRInformation.cxx b/Common/DataModel/vtkAMRInformation.cxx index 7d026837da..cbfed9fd7d 100644 --- a/Common/DataModel/vtkAMRInformation.cxx +++ b/Common/DataModel/vtkAMRInformation.cxx @@ -24,6 +24,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAMRInformation); namespace @@ -989,3 +990,4 @@ bool vtkAMRInformation::FindGrid(double q[3], int level, unsigned int& gridId) } return false; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAMRInformation.h b/Common/DataModel/vtkAMRInformation.h index a492a57702..e68a29aa25 100644 --- a/Common/DataModel/vtkAMRInformation.h +++ b/Common/DataModel/vtkAMRInformation.h @@ -39,6 +39,7 @@ typedef std::vector vtkAMRBoxList; +VTK_ABI_NAMESPACE_BEGIN class vtkUnsignedIntArray; class vtkIntArray; class vtkDoubleArray; @@ -290,4 +291,5 @@ private: std::vector>> AllParents; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAMRUtilities.cxx b/Common/DataModel/vtkAMRUtilities.cxx index d68b3cd558..16b918dafe 100644 --- a/Common/DataModel/vtkAMRUtilities.cxx +++ b/Common/DataModel/vtkAMRUtilities.cxx @@ -36,6 +36,7 @@ #define KMAX(ext) ext[5] //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkAMRUtilities::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); @@ -464,3 +465,4 @@ void vtkAMRUtilities::MergeGhostArrays(vtkDataArray* existingArray, vtkUnsignedC } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAMRUtilities.h b/Common/DataModel/vtkAMRUtilities.h index d1dc781344..bf27b51f1c 100644 --- a/Common/DataModel/vtkAMRUtilities.h +++ b/Common/DataModel/vtkAMRUtilities.h @@ -31,6 +31,7 @@ #include // For C++ vector // Forward declarations +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkFieldData; class vtkOverlappingAMR; @@ -105,4 +106,5 @@ private: static void MergeGhostArrays(vtkDataArray* existingArray, vtkUnsignedCharArray* ghosts); }; +VTK_ABI_NAMESPACE_END #endif /* vtkAMRUtilities_h */ diff --git a/Common/DataModel/vtkAbstractCellLinks.cxx b/Common/DataModel/vtkAbstractCellLinks.cxx index 6d3e46fa68..2d50196327 100644 --- a/Common/DataModel/vtkAbstractCellLinks.cxx +++ b/Common/DataModel/vtkAbstractCellLinks.cxx @@ -18,6 +18,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkAbstractCellLinks::vtkAbstractCellLinks() { this->SequentialProcessing = false; @@ -57,3 +58,4 @@ void vtkAbstractCellLinks::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Sequential Processing: " << (this->SequentialProcessing ? "true\n" : "false\n"); os << indent << "Type: " << this->Type << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAbstractCellLinks.h b/Common/DataModel/vtkAbstractCellLinks.h index b5a8013878..1fb1e05b9e 100644 --- a/Common/DataModel/vtkAbstractCellLinks.h +++ b/Common/DataModel/vtkAbstractCellLinks.h @@ -34,6 +34,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class vtkCellArray; class vtkIdList; @@ -165,4 +166,5 @@ private: void operator=(const vtkAbstractCellLinks&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAbstractCellLocator.cxx b/Common/DataModel/vtkAbstractCellLocator.cxx index 7d10a5be8e..bc2a295852 100644 --- a/Common/DataModel/vtkAbstractCellLocator.cxx +++ b/Common/DataModel/vtkAbstractCellLocator.cxx @@ -29,6 +29,7 @@ #include "vtkUnstructuredGrid.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkAbstractCellLocator::vtkAbstractCellLocator() { this->CacheCellBounds = 1; @@ -305,3 +306,4 @@ void vtkAbstractCellLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Retain Cell Lists: " << (this->RetainCellLists ? "On\n" : "Off\n"); os << indent << "Number of Cells Per Bucket: " << this->NumberOfCellsPerNode << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAbstractCellLocator.h b/Common/DataModel/vtkAbstractCellLocator.h index 450ea958ce..5abe65f773 100644 --- a/Common/DataModel/vtkAbstractCellLocator.h +++ b/Common/DataModel/vtkAbstractCellLocator.h @@ -45,6 +45,7 @@ #include // For shared_ptr #include // For Weights +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkGenericCell; class vtkIdList; @@ -383,4 +384,5 @@ private: void operator=(const vtkAbstractCellLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAbstractElectronicData.cxx b/Common/DataModel/vtkAbstractElectronicData.cxx index 3d5c8845b3..ca88c53dba 100644 --- a/Common/DataModel/vtkAbstractElectronicData.cxx +++ b/Common/DataModel/vtkAbstractElectronicData.cxx @@ -16,6 +16,7 @@ #include "vtkAbstractElectronicData.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkAbstractElectronicData::vtkAbstractElectronicData() : Padding(0.0) { @@ -48,3 +49,4 @@ void vtkAbstractElectronicData::DeepCopy(vtkDataObject* obj) // Copy ivars this->Padding = aed->Padding; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAbstractElectronicData.h b/Common/DataModel/vtkAbstractElectronicData.h index 8870dfbaf5..281f170c5e 100644 --- a/Common/DataModel/vtkAbstractElectronicData.h +++ b/Common/DataModel/vtkAbstractElectronicData.h @@ -25,6 +25,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkImageData; class VTKCOMMONDATAMODEL_EXPORT vtkAbstractElectronicData : public vtkDataObject @@ -119,4 +120,5 @@ private: void operator=(const vtkAbstractElectronicData&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAbstractPointLocator.cxx b/Common/DataModel/vtkAbstractPointLocator.cxx index 5ee1514cf0..21350961e5 100644 --- a/Common/DataModel/vtkAbstractPointLocator.cxx +++ b/Common/DataModel/vtkAbstractPointLocator.cxx @@ -18,6 +18,7 @@ #include "vtkIdList.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkAbstractPointLocator::vtkAbstractPointLocator() { for (int i = 0; i < 6; i++) @@ -85,3 +86,4 @@ void vtkAbstractPointLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Number of Buckets: " << this->NumberOfBuckets << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAbstractPointLocator.h b/Common/DataModel/vtkAbstractPointLocator.h index 77977cce6a..113dc1a0a0 100644 --- a/Common/DataModel/vtkAbstractPointLocator.h +++ b/Common/DataModel/vtkAbstractPointLocator.h @@ -33,6 +33,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkLocator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class VTKCOMMONDATAMODEL_EXPORT vtkAbstractPointLocator : public vtkLocator @@ -117,4 +118,5 @@ private: void operator=(const vtkAbstractPointLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAdjacentVertexIterator.cxx b/Common/DataModel/vtkAdjacentVertexIterator.cxx index 6e394eda67..3a61796386 100644 --- a/Common/DataModel/vtkAdjacentVertexIterator.cxx +++ b/Common/DataModel/vtkAdjacentVertexIterator.cxx @@ -23,6 +23,7 @@ #include "vtkGraph.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkAdjacentVertexIterator, Graph, vtkGraph); vtkStandardNewMacro(vtkAdjacentVertexIterator); //------------------------------------------------------------------------------ @@ -64,3 +65,4 @@ void vtkAdjacentVertexIterator::PrintSelf(ostream& os, vtkIndent indent) } os << indent << "Vertex: " << this->Vertex << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAdjacentVertexIterator.h b/Common/DataModel/vtkAdjacentVertexIterator.h index d795e39d86..bad199c470 100644 --- a/Common/DataModel/vtkAdjacentVertexIterator.h +++ b/Common/DataModel/vtkAdjacentVertexIterator.h @@ -39,6 +39,7 @@ #include "vtkGraph.h" // For edge type definitions +VTK_ABI_NAMESPACE_BEGIN class vtkGraphEdge; class VTKCOMMONDATAMODEL_EXPORT vtkAdjacentVertexIterator : public vtkObject @@ -98,4 +99,5 @@ private: void operator=(const vtkAdjacentVertexIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAngularPeriodicDataArray.h b/Common/DataModel/vtkAngularPeriodicDataArray.h index 12263dfbd8..74a3cc32a9 100644 --- a/Common/DataModel/vtkAngularPeriodicDataArray.h +++ b/Common/DataModel/vtkAngularPeriodicDataArray.h @@ -35,6 +35,7 @@ #define VTK_PERIODIC_ARRAY_AXIS_Y 1 #define VTK_PERIODIC_ARRAY_AXIS_Z 2 +VTK_ABI_NAMESPACE_BEGIN class vtkMatrix3x3; template @@ -104,6 +105,7 @@ private: vtkMatrix3x3* RotationMatrix; }; +VTK_ABI_NAMESPACE_END #include "vtkAngularPeriodicDataArray.txx" #endif // vtkAngularPeriodicDataArray_h diff --git a/Common/DataModel/vtkAngularPeriodicDataArray.txx b/Common/DataModel/vtkAngularPeriodicDataArray.txx index c2d407b3b9..0c4e85be35 100644 --- a/Common/DataModel/vtkAngularPeriodicDataArray.txx +++ b/Common/DataModel/vtkAngularPeriodicDataArray.txx @@ -21,6 +21,7 @@ //------------------------------------------------------------------------------ // Can't use vtkStandardNewMacro on a templated class. +VTK_ABI_NAMESPACE_BEGIN template vtkAngularPeriodicDataArray* vtkAngularPeriodicDataArray::New() { @@ -185,3 +186,4 @@ vtkAngularPeriodicDataArray::~vtkAngularPeriodicDataArray() { this->RotationMatrix->Delete(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAnimationScene.cxx b/Common/DataModel/vtkAnimationScene.cxx index 8eaf3a7178..406fc905fe 100644 --- a/Common/DataModel/vtkAnimationScene.cxx +++ b/Common/DataModel/vtkAnimationScene.cxx @@ -20,6 +20,7 @@ #include "vtkObjectFactory.h" #include "vtkTimerLog.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAnimationScene); //------------------------------------------------------------------------------ @@ -294,3 +295,4 @@ void vtkAnimationScene::PrintSelf(ostream& os, vtkIndent indent) os << indent << "InPlay: " << this->InPlay << endl; os << indent << "StopPlay: " << this->StopPlay << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAnimationScene.h b/Common/DataModel/vtkAnimationScene.h index ccfe5eea46..44a0e96219 100644 --- a/Common/DataModel/vtkAnimationScene.h +++ b/Common/DataModel/vtkAnimationScene.h @@ -33,6 +33,7 @@ #include "vtkAnimationCue.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkAnimationCue; class vtkCollection; class vtkCollectionIterator; @@ -153,4 +154,5 @@ private: void operator=(const vtkAnimationScene&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAnnotation.cxx b/Common/DataModel/vtkAnnotation.cxx index fe76549430..0a589886c4 100644 --- a/Common/DataModel/vtkAnnotation.cxx +++ b/Common/DataModel/vtkAnnotation.cxx @@ -31,6 +31,7 @@ #include "vtkSelection.h" #include "vtkSmartPointer.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAnnotation); vtkCxxSetObjectMacro(vtkAnnotation, Selection, vtkSelection); @@ -186,3 +187,4 @@ vtkAnnotation* vtkAnnotation::GetData(vtkInformationVector* v, int i) { return vtkAnnotation::GetData(v->GetInformationObject(i)); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAnnotation.h b/Common/DataModel/vtkAnnotation.h index 58d7b4dc9c..d9d629eeff 100644 --- a/Common/DataModel/vtkAnnotation.h +++ b/Common/DataModel/vtkAnnotation.h @@ -39,6 +39,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformationStringKey; class vtkInformationDoubleVectorKey; class vtkInformationIntegerVectorKey; @@ -144,4 +145,5 @@ private: void operator=(const vtkAnnotation&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAnnotationLayers.cxx b/Common/DataModel/vtkAnnotationLayers.cxx index a74a831362..66b0fd5aae 100644 --- a/Common/DataModel/vtkAnnotationLayers.cxx +++ b/Common/DataModel/vtkAnnotationLayers.cxx @@ -33,6 +33,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAnnotationLayers); vtkCxxSetObjectMacro(vtkAnnotationLayers, CurrentAnnotation, vtkAnnotation); @@ -219,3 +220,4 @@ vtkAnnotationLayers* vtkAnnotationLayers::GetData(vtkInformationVector* v, int i { return vtkAnnotationLayers::GetData(v->GetInformationObject(i)); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAnnotationLayers.h b/Common/DataModel/vtkAnnotationLayers.h index f3fa13cd7d..db821b23d2 100644 --- a/Common/DataModel/vtkAnnotationLayers.h +++ b/Common/DataModel/vtkAnnotationLayers.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkAnnotation; class vtkSelection; @@ -131,4 +132,5 @@ private: void operator=(const vtkAnnotationLayers&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkArrayData.cxx b/Common/DataModel/vtkArrayData.cxx index 843c3c0782..275789ebef 100644 --- a/Common/DataModel/vtkArrayData.cxx +++ b/Common/DataModel/vtkArrayData.cxx @@ -32,6 +32,7 @@ // Standard functions // +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkArrayData); class vtkArrayData::implementation @@ -188,3 +189,4 @@ void vtkArrayData::DeepCopy(vtkDataObject* other) Superclass::DeepCopy(other); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkArrayData.h b/Common/DataModel/vtkArrayData.h index 51e0ff2080..ba8988c814 100644 --- a/Common/DataModel/vtkArrayData.h +++ b/Common/DataModel/vtkArrayData.h @@ -43,6 +43,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkArray; class VTKCOMMONDATAMODEL_EXPORT vtkArrayData : public vtkDataObject @@ -100,4 +101,5 @@ private: implementation* const Implementation; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkArrayListTemplate.h b/Common/DataModel/vtkArrayListTemplate.h index 4d985e87a6..50f0b240fb 100644 --- a/Common/DataModel/vtkArrayListTemplate.h +++ b/Common/DataModel/vtkArrayListTemplate.h @@ -55,6 +55,7 @@ // Create a generic class supporting virtual dispatch to type-specific // subclasses. +VTK_ABI_NAMESPACE_BEGIN struct BaseArrayPair { vtkIdType Num; @@ -424,6 +425,7 @@ struct ArrayList vtkIdType GetNumberOfArrays() { return static_cast(Arrays.size()); } }; +VTK_ABI_NAMESPACE_END #include "vtkArrayListTemplate.txx" #endif diff --git a/Common/DataModel/vtkArrayListTemplate.txx b/Common/DataModel/vtkArrayListTemplate.txx index eeaef8bd96..9a9e90a43d 100644 --- a/Common/DataModel/vtkArrayListTemplate.txx +++ b/Common/DataModel/vtkArrayListTemplate.txx @@ -22,6 +22,7 @@ //---------------------------------------------------------------------------- // Sort of a little object factory (in conjunction w/ vtkTemplateMacro()) +VTK_ABI_NAMESPACE_BEGIN template void CreateArrayPair(ArrayList* list, T* inData, T* outData, vtkIdType numTuples, int numComp, vtkAbstractArray* outArray, T nullValue) @@ -197,4 +198,5 @@ inline void ArrayList::AddSelfInterpolatingArrays( } // for each candidate array } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkAtom.cxx b/Common/DataModel/vtkAtom.cxx index 7526ddef36..31d281473f 100644 --- a/Common/DataModel/vtkAtom.cxx +++ b/Common/DataModel/vtkAtom.cxx @@ -20,6 +20,7 @@ PURPOSE. See the above copyright notice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkAtom::vtkAtom(vtkMolecule* parent, vtkIdType id) : Molecule(parent) , Id(id) @@ -82,3 +83,4 @@ void vtkAtom::SetPosition(const vtkVector3f& pos) { this->Molecule->SetAtomPosition(this->Id, pos); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAtom.h b/Common/DataModel/vtkAtom.h index 2dc72c0334..aa99370b38 100644 --- a/Common/DataModel/vtkAtom.h +++ b/Common/DataModel/vtkAtom.h @@ -24,6 +24,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" // For macros, defines, etc +VTK_ABI_NAMESPACE_BEGIN class vtkMolecule; class vtkVector3d; class vtkVector3f; @@ -82,5 +83,6 @@ inline vtkMolecule* vtkAtom::GetMolecule() return this->Molecule; } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkAtom.h diff --git a/Common/DataModel/vtkAttributesErrorMetric.cxx b/Common/DataModel/vtkAttributesErrorMetric.cxx index 4c0749fe68..1bac9d6586 100644 --- a/Common/DataModel/vtkAttributesErrorMetric.cxx +++ b/Common/DataModel/vtkAttributesErrorMetric.cxx @@ -22,6 +22,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkAttributesErrorMetric); //------------------------------------------------------------------------------ @@ -268,3 +269,4 @@ void vtkAttributesErrorMetric::ComputeSquareAbsoluteAttributeTolerance() } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkAttributesErrorMetric.h b/Common/DataModel/vtkAttributesErrorMetric.h index f958ffee29..ef72947648 100644 --- a/Common/DataModel/vtkAttributesErrorMetric.h +++ b/Common/DataModel/vtkAttributesErrorMetric.h @@ -31,6 +31,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkGenericSubdivisionErrorMetric.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericAttributeCollection; class vtkGenericDataSet; @@ -160,4 +161,5 @@ private: void operator=(const vtkAttributesErrorMetric&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBSPCuts.cxx b/Common/DataModel/vtkBSPCuts.cxx index 53c2671649..4f94c6b265 100644 --- a/Common/DataModel/vtkBSPCuts.cxx +++ b/Common/DataModel/vtkBSPCuts.cxx @@ -23,6 +23,7 @@ #include "vtkKdTree.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBSPCuts); //------------------------------------------------------------------------------ @@ -611,3 +612,4 @@ void vtkBSPCuts::PrintSelf(ostream& os, vtkIndent indent) os << indent << "UpperDataCoord: " << this->UpperDataCoord << endl; os << indent << "Npoints: " << this->Npoints << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBSPCuts.h b/Common/DataModel/vtkBSPCuts.h index fc20799306..1a52d2c1b0 100644 --- a/Common/DataModel/vtkBSPCuts.h +++ b/Common/DataModel/vtkBSPCuts.h @@ -39,6 +39,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkKdNode; class VTKCOMMONDATAMODEL_EXPORT vtkBSPCuts : public vtkDataObject @@ -169,4 +170,5 @@ protected: void operator=(const vtkBSPCuts&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBSPIntersections.cxx b/Common/DataModel/vtkBSPIntersections.cxx index 98da882504..1cd63bef56 100644 --- a/Common/DataModel/vtkBSPIntersections.cxx +++ b/Common/DataModel/vtkBSPIntersections.cxx @@ -28,6 +28,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBSPIntersections); #define REGIONCHECK(err) \ @@ -499,3 +500,4 @@ void vtkBSPIntersections::PrintSelf(ostream& os, vtkIndent indent) os << indent << "CellBoundsCache " << d[0] << " " << d[1] << " " << d[2] << " " << d[3] << " " << d[4] << " " << d[5] << " " << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBSPIntersections.h b/Common/DataModel/vtkBSPIntersections.h index 20db5a7d91..4ac1f12260 100644 --- a/Common/DataModel/vtkBSPIntersections.h +++ b/Common/DataModel/vtkBSPIntersections.h @@ -37,6 +37,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkTimeStamp; class vtkCell; class vtkKdNode; @@ -198,4 +199,5 @@ private: vtkBSPIntersections(const vtkBSPIntersections&) = delete; void operator=(const vtkBSPIntersections&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBezierCurve.cxx b/Common/DataModel/vtkBezierCurve.cxx index dad795f795..e10d9cfe95 100644 --- a/Common/DataModel/vtkBezierCurve.cxx +++ b/Common/DataModel/vtkBezierCurve.cxx @@ -27,6 +27,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBezierCurve); vtkBezierCurve::vtkBezierCurve() = default; @@ -140,3 +141,4 @@ vtkDoubleArray* vtkBezierCurve::GetRationalWeights() { return RationalWeights.Get(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBezierCurve.h b/Common/DataModel/vtkBezierCurve.h index 59b3f3158e..49f4990193 100644 --- a/Common/DataModel/vtkBezierCurve.h +++ b/Common/DataModel/vtkBezierCurve.h @@ -25,6 +25,7 @@ #include "vtkNew.h" // For member variable. #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkIdList; @@ -62,4 +63,5 @@ private: void operator=(const vtkBezierCurve&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkBezierCurve_h diff --git a/Common/DataModel/vtkBezierHexahedron.cxx b/Common/DataModel/vtkBezierHexahedron.cxx index b7a61a77f2..4da2b51cea 100644 --- a/Common/DataModel/vtkBezierHexahedron.cxx +++ b/Common/DataModel/vtkBezierHexahedron.cxx @@ -31,6 +31,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBezierHexahedron); vtkBezierHexahedron::vtkBezierHexahedron() = default; @@ -229,3 +230,4 @@ vtkHigherOrderInterpolation* vtkBezierHexahedron::GetInterpolation() { return Interp; }; +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBezierHexahedron.h b/Common/DataModel/vtkBezierHexahedron.h index 6959c5395e..958fa30df9 100644 --- a/Common/DataModel/vtkBezierHexahedron.h +++ b/Common/DataModel/vtkBezierHexahedron.h @@ -32,6 +32,7 @@ #include "vtkNew.h" // For member variable. #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkHexahedron; @@ -81,4 +82,5 @@ private: void operator=(const vtkBezierHexahedron&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkBezierHexahedron_h diff --git a/Common/DataModel/vtkBezierInterpolation.cxx b/Common/DataModel/vtkBezierInterpolation.cxx index 57e45da836..e427830b83 100644 --- a/Common/DataModel/vtkBezierInterpolation.cxx +++ b/Common/DataModel/vtkBezierInterpolation.cxx @@ -28,6 +28,7 @@ #include "vtkVectorOperators.h" #include // std::accumulate +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBezierInterpolation); vtkBezierInterpolation::vtkBezierInterpolation() = default; @@ -380,3 +381,4 @@ void vtkBezierInterpolation::WedgeEvaluateDerivative(const int order[3], const d this->vtkHigherOrderInterpolation::WedgeEvaluateDerivative(order, pcoords, points, fieldVals, fieldDim, fieldDerivs, *tri, vtkBezierInterpolation::EvaluateShapeAndGradient); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBezierInterpolation.h b/Common/DataModel/vtkBezierInterpolation.h index d11ea0e2aa..17d026a810 100644 --- a/Common/DataModel/vtkBezierInterpolation.h +++ b/Common/DataModel/vtkBezierInterpolation.h @@ -28,6 +28,7 @@ // Define this to include support for a "complete" (21- vs 18-point) wedge. #define VTK_21_POINT_WEDGE true +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkVector2i; class vtkVector3d; @@ -90,4 +91,5 @@ private: void operator=(const vtkBezierInterpolation&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkBezierInterpolation_h diff --git a/Common/DataModel/vtkBezierQuadrilateral.cxx b/Common/DataModel/vtkBezierQuadrilateral.cxx index 13156740d6..1fe074dda2 100644 --- a/Common/DataModel/vtkBezierQuadrilateral.cxx +++ b/Common/DataModel/vtkBezierQuadrilateral.cxx @@ -29,6 +29,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBezierQuadrilateral); vtkBezierQuadrilateral::vtkBezierQuadrilateral() = default; @@ -187,3 +188,4 @@ vtkHigherOrderCurve* vtkBezierQuadrilateral::GetEdgeCell() { return EdgeCell; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBezierQuadrilateral.h b/Common/DataModel/vtkBezierQuadrilateral.h index 475165dad3..cfd611e92f 100644 --- a/Common/DataModel/vtkBezierQuadrilateral.h +++ b/Common/DataModel/vtkBezierQuadrilateral.h @@ -25,6 +25,7 @@ #include "vtkNew.h" // For member variable. #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkIdList; @@ -70,4 +71,5 @@ private: void operator=(const vtkBezierQuadrilateral&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkBezierQuadrilateral_h diff --git a/Common/DataModel/vtkBezierTetra.cxx b/Common/DataModel/vtkBezierTetra.cxx index 4af346db5d..cf5572388b 100644 --- a/Common/DataModel/vtkBezierTetra.cxx +++ b/Common/DataModel/vtkBezierTetra.cxx @@ -27,6 +27,7 @@ #include "vtkPoints.h" #include "vtkTetra.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBezierTetra); //------------------------------------------------------------------------------ vtkBezierTetra::vtkBezierTetra() = default; @@ -189,3 +190,4 @@ vtkHigherOrderTriangle* vtkBezierTetra::GetFaceCell() { return FaceCell; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBezierTetra.h b/Common/DataModel/vtkBezierTetra.h index 8c444024c9..03538c1af8 100644 --- a/Common/DataModel/vtkBezierTetra.h +++ b/Common/DataModel/vtkBezierTetra.h @@ -34,6 +34,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkHigherOrderTetra.h" +VTK_ABI_NAMESPACE_BEGIN class vtkTetra; class vtkBezierCurve; class vtkBezierTriangle; @@ -71,4 +72,5 @@ private: void operator=(const vtkBezierTetra&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBezierTriangle.cxx b/Common/DataModel/vtkBezierTriangle.cxx index 2ef4869b3d..08e3cb0aab 100644 --- a/Common/DataModel/vtkBezierTriangle.cxx +++ b/Common/DataModel/vtkBezierTriangle.cxx @@ -32,6 +32,7 @@ #define ENABLE_CACHING #define SEVEN_POINT_TRIANGLE +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBezierTriangle); //------------------------------------------------------------------------------ vtkBezierTriangle::vtkBezierTriangle() = default; @@ -156,3 +157,4 @@ vtkHigherOrderCurve* vtkBezierTriangle::GetEdgeCell() { return EdgeCell; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBezierTriangle.h b/Common/DataModel/vtkBezierTriangle.h index 1f5d28bc25..5ec27b2ae8 100644 --- a/Common/DataModel/vtkBezierTriangle.h +++ b/Common/DataModel/vtkBezierTriangle.h @@ -34,6 +34,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkHigherOrderTriangle.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkBezierCurve; class vtkTriangle; @@ -68,4 +69,5 @@ private: void operator=(const vtkBezierTriangle&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBezierWedge.cxx b/Common/DataModel/vtkBezierWedge.cxx index c02f1e27c2..496905e760 100644 --- a/Common/DataModel/vtkBezierWedge.cxx +++ b/Common/DataModel/vtkBezierWedge.cxx @@ -32,6 +32,7 @@ #include "vtkVectorOperators.h" #include "vtkWedge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBezierWedge); vtkBezierWedge::vtkBezierWedge() = default; @@ -216,3 +217,4 @@ vtkHigherOrderInterpolation* vtkBezierWedge::GetInterpolation() { return Interp; }; +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBezierWedge.h b/Common/DataModel/vtkBezierWedge.h index cb3f4d394d..632af06f40 100644 --- a/Common/DataModel/vtkBezierWedge.h +++ b/Common/DataModel/vtkBezierWedge.h @@ -40,6 +40,7 @@ #include "vtkNew.h" // For member variable. #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkWedge; @@ -92,4 +93,5 @@ private: void operator=(const vtkBezierWedge&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkBezierWedge_h diff --git a/Common/DataModel/vtkBiQuadraticQuad.cxx b/Common/DataModel/vtkBiQuadraticQuad.cxx index 9fad872a48..eb867cc8a3 100644 --- a/Common/DataModel/vtkBiQuadraticQuad.cxx +++ b/Common/DataModel/vtkBiQuadraticQuad.cxx @@ -26,6 +26,7 @@ #include "vtkQuad.h" #include "vtkQuadraticEdge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBiQuadraticQuad); //------------------------------------------------------------------------------ @@ -462,3 +463,4 @@ void vtkBiQuadraticQuad::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBiQuadraticQuad.h b/Common/DataModel/vtkBiQuadraticQuad.h index a9038debc1..b36245c998 100644 --- a/Common/DataModel/vtkBiQuadraticQuad.h +++ b/Common/DataModel/vtkBiQuadraticQuad.h @@ -43,6 +43,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkQuad; class vtkTriangle; @@ -132,4 +133,5 @@ inline int vtkBiQuadraticQuad::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.cxx b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.cxx index 9dd59f4f10..36932c4d24 100644 --- a/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.cxx +++ b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.cxx @@ -30,6 +30,7 @@ #include "vtkQuadraticQuad.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBiQuadraticQuadraticHexahedron); //------------------------------------------------------------------------------ @@ -828,3 +829,4 @@ void vtkBiQuadraticQuadraticHexahedron::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h index 4532e278d9..3868df33ae 100644 --- a/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h +++ b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h @@ -71,6 +71,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkQuadraticQuad; class vtkBiQuadraticQuad; @@ -181,4 +182,5 @@ private: void operator=(const vtkBiQuadraticQuadraticHexahedron&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBiQuadraticQuadraticWedge.cxx b/Common/DataModel/vtkBiQuadraticQuadraticWedge.cxx index b62a7e250e..4082e6c310 100644 --- a/Common/DataModel/vtkBiQuadraticQuadraticWedge.cxx +++ b/Common/DataModel/vtkBiQuadraticQuadraticWedge.cxx @@ -29,6 +29,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBiQuadraticQuadraticWedge); //------------------------------------------------------------------------------ @@ -706,3 +707,4 @@ void vtkBiQuadraticQuadraticWedge::PrintSelf(ostream & os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf (os, indent.GetNextIndent ()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBiQuadraticQuadraticWedge.h b/Common/DataModel/vtkBiQuadraticQuadraticWedge.h index aae908a045..ed33ded974 100644 --- a/Common/DataModel/vtkBiQuadraticQuadraticWedge.h +++ b/Common/DataModel/vtkBiQuadraticQuadraticWedge.h @@ -44,6 +44,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkBiQuadraticQuad; class vtkQuadraticTriangle; @@ -161,4 +162,5 @@ inline int vtkBiQuadraticQuadraticWedge::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBiQuadraticTriangle.cxx b/Common/DataModel/vtkBiQuadraticTriangle.cxx index 34f03d7708..14ad41c0e3 100644 --- a/Common/DataModel/vtkBiQuadraticTriangle.cxx +++ b/Common/DataModel/vtkBiQuadraticTriangle.cxx @@ -22,6 +22,7 @@ #include "vtkQuadraticEdge.h" #include "vtkTriangle.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBiQuadraticTriangle); //------------------------------------------------------------------------------ @@ -504,3 +505,4 @@ void vtkBiQuadraticTriangle::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Face: " << this->Face << endl; os << indent << "Scalars: " << this->Scalars << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBiQuadraticTriangle.h b/Common/DataModel/vtkBiQuadraticTriangle.h index 1b810900e3..f93720c3b9 100644 --- a/Common/DataModel/vtkBiQuadraticTriangle.h +++ b/Common/DataModel/vtkBiQuadraticTriangle.h @@ -41,6 +41,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkTriangle; class vtkDoubleArray; @@ -141,4 +142,5 @@ inline int vtkBiQuadraticTriangle::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkBond.cxx b/Common/DataModel/vtkBond.cxx index bf7e703295..9a84a26815 100644 --- a/Common/DataModel/vtkBond.cxx +++ b/Common/DataModel/vtkBond.cxx @@ -22,6 +22,7 @@ PURPOSE. See the above copyright notice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkBond::vtkBond(vtkMolecule* parent, vtkIdType id, vtkIdType beginAtomId, vtkIdType endAtomId) : Molecule(parent) , Id(id) @@ -94,3 +95,4 @@ unsigned short vtkBond::GetOrder() { return this->Molecule->GetBondOrder(this->Id); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBond.h b/Common/DataModel/vtkBond.h index 7a54f2e3b3..3fb2d14244 100644 --- a/Common/DataModel/vtkBond.h +++ b/Common/DataModel/vtkBond.h @@ -25,6 +25,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" // For macros, etc +VTK_ABI_NAMESPACE_BEGIN class vtkMolecule; class VTKCOMMONDATAMODEL_EXPORT vtkBond @@ -95,5 +96,6 @@ inline vtkMolecule* vtkBond::GetMolecule() return this->Molecule; } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkBond.h diff --git a/Common/DataModel/vtkBoundingBox.cxx b/Common/DataModel/vtkBoundingBox.cxx index e089cff4e6..2c71d79847 100644 --- a/Common/DataModel/vtkBoundingBox.cxx +++ b/Common/DataModel/vtkBoundingBox.cxx @@ -27,6 +27,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN namespace { inline double Sign(const double& a) @@ -991,3 +992,4 @@ void vtkBoundingBox::ComputeLocalBounds( } bbox.GetBounds(outputBounds); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBoundingBox.h b/Common/DataModel/vtkBoundingBox.h index 136eff9cff..5bf1e0b29f 100644 --- a/Common/DataModel/vtkBoundingBox.h +++ b/Common/DataModel/vtkBoundingBox.h @@ -31,6 +31,7 @@ PURPOSE. See the above copyright notice for more information. #include "vtkSystemIncludes.h" #include // For threaded bounding box computation +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class VTKCOMMONDATAMODEL_EXPORT vtkBoundingBox @@ -567,5 +568,6 @@ inline void vtkBoundingBox::GetCorner(int corner, double p[3]) const p[2] = pts[iz][2]; } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkBoundingBox.h diff --git a/Common/DataModel/vtkBox.cxx b/Common/DataModel/vtkBox.cxx index 171b72a459..24f2d323ea 100644 --- a/Common/DataModel/vtkBox.cxx +++ b/Common/DataModel/vtkBox.cxx @@ -23,6 +23,7 @@ #include // for IntersectWithInfiniteLine #include // for IntersectWithPlane +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkBox); // Construct the box centered at the origin and each side length 1.0. @@ -901,3 +902,4 @@ vtkTypeBool vtkBox::IsBoxInFrustum(double planes[24], double bounds[6]) // not sure so return true return true; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBox.h b/Common/DataModel/vtkBox.h index f50e6c9066..34cab8607f 100644 --- a/Common/DataModel/vtkBox.h +++ b/Common/DataModel/vtkBox.h @@ -33,6 +33,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkBoundingBox; class VTKCOMMONDATAMODEL_EXPORT vtkBox : public vtkImplicitFunction @@ -181,4 +182,5 @@ inline void vtkBox::SetXMax(double p[3]) this->SetXMax(p[0], p[1], p[2]); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCell.cxx b/Common/DataModel/vtkCell.cxx index d586704bb6..a41cb47ddc 100644 --- a/Common/DataModel/vtkCell.cxx +++ b/Common/DataModel/vtkCell.cxx @@ -27,6 +27,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN namespace { //---------------------------------------------------------------------------- @@ -596,3 +597,4 @@ double* vtkCell::GetParametricCoords() { return nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCell.h b/Common/DataModel/vtkCell.h index 412e542bc1..f771e26558 100644 --- a/Common/DataModel/vtkCell.h +++ b/Common/DataModel/vtkCell.h @@ -47,6 +47,7 @@ #include "vtkCellType.h" // Needed to define cell types #include "vtkIdList.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkCellData; class vtkDataArray; @@ -405,4 +406,5 @@ private: void operator=(const vtkCell&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCell3D.cxx b/Common/DataModel/vtkCell3D.cxx index e7d2eb8c9a..a343837af5 100644 --- a/Common/DataModel/vtkCell3D.cxx +++ b/Common/DataModel/vtkCell3D.cxx @@ -30,6 +30,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkCell3D::vtkCell3D() { this->Triangulator = nullptr; @@ -519,3 +520,4 @@ void vtkCell3D::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Merge Tolerance: " << this->MergeTolerance << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCell3D.h b/Common/DataModel/vtkCell3D.h index 9bd6db9d9b..13b262912f 100644 --- a/Common/DataModel/vtkCell3D.h +++ b/Common/DataModel/vtkCell3D.h @@ -30,6 +30,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkOrderedTriangulator; class vtkTetra; class vtkCellArray; @@ -218,4 +219,5 @@ private: void operator=(const vtkCell3D&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCellArray.cxx b/Common/DataModel/vtkCellArray.cxx index 7817a0f5ec..2353b95f42 100644 --- a/Common/DataModel/vtkCellArray.cxx +++ b/Common/DataModel/vtkCellArray.cxx @@ -533,6 +533,7 @@ struct AppendImpl } // end anon namespace +VTK_ABI_NAMESPACE_BEGIN vtkCellArray::vtkCellArray() = default; vtkCellArray::~vtkCellArray() = default; vtkStandardNewMacro(vtkCellArray); @@ -867,6 +868,8 @@ void vtkCellArray::SetData( #endif } +VTK_ABI_NAMESPACE_END + namespace { @@ -909,6 +912,7 @@ struct GenerateOffsetsImpl } // end anon namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ bool vtkCellArray::SetData(vtkDataArray* offsets, vtkDataArray* connectivity) { @@ -1231,3 +1235,4 @@ vtkIdType vtkCellArray::IsHomogeneous() { return this->Visit(IsHomogeneousImpl{}); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellArray.h b/Common/DataModel/vtkCellArray.h index 01e8cd5fb2..f05b685f22 100644 --- a/Common/DataModel/vtkCellArray.h +++ b/Common/DataModel/vtkCellArray.h @@ -174,6 +174,7 @@ */ #define VTK_CELL_ARRAY_V2 +VTK_ABI_NAMESPACE_BEGIN class vtkCellArrayIterator; class vtkIdTypeArray; @@ -1377,9 +1378,11 @@ vtkCellArray::VisitState::GetCellRange(vtkIdType cellId) return vtk::DataArrayValueRange<1>( this->GetConnectivity(), this->GetBeginOffset(cellId), this->GetEndOffset(cellId)); } +VTK_ABI_NAMESPACE_END namespace vtkCellArray_detail { +VTK_ABI_NAMESPACE_BEGIN struct InsertNextCellImpl { @@ -1522,8 +1525,10 @@ struct ResetImpl } }; +VTK_ABI_NAMESPACE_END } // end namespace vtkCellArray_detail +VTK_ABI_NAMESPACE_BEGIN //---------------------------------------------------------------------------- inline void vtkCellArray::InitTraversal() { @@ -1639,4 +1644,5 @@ inline void vtkCellArray::Reset() this->Visit(vtkCellArray_detail::ResetImpl{}); } +VTK_ABI_NAMESPACE_END #endif // vtkCellArray.h diff --git a/Common/DataModel/vtkCellArrayIterator.cxx b/Common/DataModel/vtkCellArrayIterator.cxx index dc4050a4bf..d9365c4d9b 100644 --- a/Common/DataModel/vtkCellArrayIterator.cxx +++ b/Common/DataModel/vtkCellArrayIterator.cxx @@ -16,6 +16,7 @@ #include "vtkCellArrayIterator.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCellArrayIterator); void vtkCellArrayIterator::PrintSelf(std::ostream& os, vtkIndent indent) @@ -25,3 +26,4 @@ void vtkCellArrayIterator::PrintSelf(std::ostream& os, vtkIndent indent) os << indent << "CurrentCellId: " << this->CurrentCellId << "\n"; os << indent << "CellArray: " << this->CellArray.Get() << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellArrayIterator.h b/Common/DataModel/vtkCellArrayIterator.h index 517254ccaa..2f408e05e4 100644 --- a/Common/DataModel/vtkCellArrayIterator.h +++ b/Common/DataModel/vtkCellArrayIterator.h @@ -75,6 +75,7 @@ #include // for assert #include // for std::enable_if +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkCellArrayIterator : public vtkObject { public: @@ -255,4 +256,5 @@ private: void operator=(const vtkCellArrayIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkCellArrayIterator_h diff --git a/Common/DataModel/vtkCellData.cxx b/Common/DataModel/vtkCellData.cxx index b719456462..7a37a120ac 100644 --- a/Common/DataModel/vtkCellData.cxx +++ b/Common/DataModel/vtkCellData.cxx @@ -17,6 +17,7 @@ #include "vtkDataSetAttributes.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCellData); vtkStandardExtendedNewMacro(vtkCellData); @@ -31,3 +32,4 @@ void vtkCellData::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellData.h b/Common/DataModel/vtkCellData.h index f508f6b5ff..28841568e2 100644 --- a/Common/DataModel/vtkCellData.h +++ b/Common/DataModel/vtkCellData.h @@ -32,6 +32,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataSetAttributes.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkCellData : public vtkDataSetAttributes { public: @@ -50,4 +51,5 @@ private: void operator=(const vtkCellData&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCellIterator.cxx b/Common/DataModel/vtkCellIterator.cxx index cfacc97f46..cfc58e9a62 100644 --- a/Common/DataModel/vtkCellIterator.cxx +++ b/Common/DataModel/vtkCellIterator.cxx @@ -21,6 +21,7 @@ #include "vtkPoints.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkCellIterator::PrintSelf(ostream& os, vtkIndent indent) { os << indent << "CacheFlags: "; @@ -169,3 +170,4 @@ vtkCellIterator::vtkCellIterator() //------------------------------------------------------------------------------ vtkCellIterator::~vtkCellIterator() = default; +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellIterator.h b/Common/DataModel/vtkCellIterator.h index 101bef3997..262225130e 100644 --- a/Common/DataModel/vtkCellIterator.h +++ b/Common/DataModel/vtkCellIterator.h @@ -71,6 +71,7 @@ #include "vtkNew.h" // For vtkNew #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericCell; class vtkPoints; @@ -384,4 +385,5 @@ inline vtkIdType vtkCellIterator::GetNumberOfFaces() return 0; } +VTK_ABI_NAMESPACE_END #endif // vtkCellIterator_h diff --git a/Common/DataModel/vtkCellLinks.cxx b/Common/DataModel/vtkCellLinks.cxx index 865ff42817..311435c693 100644 --- a/Common/DataModel/vtkCellLinks.cxx +++ b/Common/DataModel/vtkCellLinks.cxx @@ -23,6 +23,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCellLinks); //------------------------------------------------------------------------------ @@ -304,3 +305,4 @@ void vtkCellLinks::PrintSelf(ostream& os, vtkIndent indent) os << indent << "MaxId: " << this->MaxId << "\n"; os << indent << "Extend: " << this->Extend << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellLinks.h b/Common/DataModel/vtkCellLinks.h index 4df2c3d8d2..977cb5bf0e 100644 --- a/Common/DataModel/vtkCellLinks.h +++ b/Common/DataModel/vtkCellLinks.h @@ -39,6 +39,7 @@ #include "vtkAbstractCellLinks.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class vtkCellArray; @@ -264,4 +265,5 @@ inline void vtkCellLinks::ResizeCellList(vtkIdType ptId, int size) this->Array[ptId].cells = cells; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCellLocator.cxx b/Common/DataModel/vtkCellLocator.cxx index c729de254e..c0c9c81d1a 100644 --- a/Common/DataModel/vtkCellLocator.cxx +++ b/Common/DataModel/vtkCellLocator.cxx @@ -27,6 +27,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkStandardNewMacro(vtkCellLocator); @@ -1465,3 +1466,4 @@ void vtkCellLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "H: " << this->H[0] << " " << this->H[1] << " " << this->H[2] << "\n"; os << indent << "NumberOfDivisions: " << this->NumberOfDivisions << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellLocator.h b/Common/DataModel/vtkCellLocator.h index d7edceae4f..964c2c104e 100644 --- a/Common/DataModel/vtkCellLocator.h +++ b/Common/DataModel/vtkCellLocator.h @@ -50,6 +50,7 @@ #include "vtkDeprecation.h" // For VTK_DEPRECATED_IN_9_2_0 #include "vtkNew.h" // For vtkNew +VTK_ABI_NAMESPACE_BEGIN class vtkIntArray; class VTKCOMMONDATAMODEL_EXPORT vtkCellLocator : public vtkAbstractCellLocator @@ -241,4 +242,5 @@ private: void operator=(const vtkCellLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCellLocatorStrategy.cxx b/Common/DataModel/vtkCellLocatorStrategy.cxx index 6e2d4ffcba..4c741c60c4 100644 --- a/Common/DataModel/vtkCellLocatorStrategy.cxx +++ b/Common/DataModel/vtkCellLocatorStrategy.cxx @@ -21,6 +21,7 @@ #include "vtkPointSet.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCellLocatorStrategy); //------------------------------------------------------------------------------ @@ -177,3 +178,4 @@ void vtkCellLocatorStrategy::PrintSelf(ostream& os, vtkIndent indent) os << indent << "CellLocator: " << this->CellLocator << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellLocatorStrategy.h b/Common/DataModel/vtkCellLocatorStrategy.h index d5733c29d8..d8ff85fcdb 100644 --- a/Common/DataModel/vtkCellLocatorStrategy.h +++ b/Common/DataModel/vtkCellLocatorStrategy.h @@ -31,6 +31,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkFindCellStrategy.h" +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractCellLocator; class VTKCOMMONDATAMODEL_EXPORT vtkCellLocatorStrategy : public vtkFindCellStrategy @@ -101,4 +102,5 @@ private: void operator=(const vtkCellLocatorStrategy&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCellTreeLocator.cxx b/Common/DataModel/vtkCellTreeLocator.cxx index 126311f0cd..634c797e6b 100644 --- a/Common/DataModel/vtkCellTreeLocator.cxx +++ b/Common/DataModel/vtkCellTreeLocator.cxx @@ -30,12 +30,15 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkStandardNewMacro(vtkCellTreeLocator); +VTK_ABI_NAMESPACE_END //------------------------------------------------------------------------------ namespace detail { +VTK_ABI_NAMESPACE_BEGIN enum { POS_X, @@ -1284,8 +1287,10 @@ void CellTree::FindCellsWithinBounds(double* bbox, vtkIdList* cells) } } } +VTK_ABI_NAMESPACE_END } // namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkCellTreeLocator::vtkCellTreeLocator() { @@ -1488,3 +1493,4 @@ void vtkCellTreeLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "NumberOfBuckets: " << this->NumberOfBuckets << "\n"; os << indent << "LargeIds: " << this->LargeIds << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellTreeLocator.h b/Common/DataModel/vtkCellTreeLocator.h index c360988e1d..f6b49bd708 100644 --- a/Common/DataModel/vtkCellTreeLocator.h +++ b/Common/DataModel/vtkCellTreeLocator.h @@ -57,14 +57,17 @@ namespace detail { +VTK_ABI_NAMESPACE_BEGIN // Forward declarations for PIMPL struct vtkCellTree; template struct CellTree; template struct CellTreeBuilder; +VTK_ABI_NAMESPACE_END } +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkCellTreeLocator : public vtkAbstractCellLocator { template @@ -190,5 +193,6 @@ private: vtkCellTreeLocator(const vtkCellTreeLocator&) = delete; void operator=(const vtkCellTreeLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCellType.h b/Common/DataModel/vtkCellType.h index 5596a38f63..3196647a82 100644 --- a/Common/DataModel/vtkCellType.h +++ b/Common/DataModel/vtkCellType.h @@ -26,6 +26,8 @@ #ifndef vtkCellType_h #define vtkCellType_h +#include "vtkABINamespace.h" + // To add a new cell type, define a new integer type flag here, then // create a subclass of vtkCell to implement the proper behavior. You // may have to modify the following methods: vtkDataSet (and subclasses) @@ -40,6 +42,7 @@ // unsigned char array. Therefore, the maximum encoding number for a cell type // is 255. +VTK_ABI_NAMESPACE_BEGIN typedef enum { // Linear cells @@ -127,5 +130,6 @@ typedef enum VTK_NUMBER_OF_CELL_TYPES } VTKCellType; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkCellType.h diff --git a/Common/DataModel/vtkCellTypes.cxx b/Common/DataModel/vtkCellTypes.cxx index 5375edbff4..61bef7881e 100644 --- a/Common/DataModel/vtkCellTypes.cxx +++ b/Common/DataModel/vtkCellTypes.cxx @@ -24,6 +24,7 @@ #include "vtkObjectFactory.h" #include "vtkUnsignedCharArray.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCellTypes); namespace @@ -308,3 +309,4 @@ void vtkCellTypes::PrintSelf(ostream& os, vtkIndent indent) os << indent << "MaxId: " << this->MaxId << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCellTypes.h b/Common/DataModel/vtkCellTypes.h index 980380e2c7..f11cf960a6 100644 --- a/Common/DataModel/vtkCellTypes.h +++ b/Common/DataModel/vtkCellTypes.h @@ -45,6 +45,7 @@ #include "vtkSmartPointer.h" // Needed for internals #include "vtkUnsignedCharArray.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkIntArray; class VTKCOMMONDATAMODEL_EXPORT vtkCellTypes : public vtkObject @@ -218,4 +219,5 @@ inline int vtkCellTypes::IsLinear(unsigned char type) return ((type <= 20) || (type == VTK_CONVEX_POINT_SET) || (type == VTK_POLYHEDRON)); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkClosestNPointsStrategy.cxx b/Common/DataModel/vtkClosestNPointsStrategy.cxx index aecccf992b..5d44b83bed 100644 --- a/Common/DataModel/vtkClosestNPointsStrategy.cxx +++ b/Common/DataModel/vtkClosestNPointsStrategy.cxx @@ -25,6 +25,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkClosestNPointsStrategy); //------------------------------------------------------------------------------ @@ -105,3 +106,4 @@ void vtkClosestNPointsStrategy::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkClosestNPointsStrategy.h b/Common/DataModel/vtkClosestNPointsStrategy.h index 7546a3555d..ef76493828 100644 --- a/Common/DataModel/vtkClosestNPointsStrategy.h +++ b/Common/DataModel/vtkClosestNPointsStrategy.h @@ -32,6 +32,7 @@ #include "vtkClosestPointStrategy.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkClosestNPointsStrategy : public vtkClosestPointStrategy { public: @@ -84,4 +85,5 @@ private: void operator=(const vtkClosestNPointsStrategy&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkClosestPointStrategy.cxx b/Common/DataModel/vtkClosestPointStrategy.cxx index 5d17f4b213..0fa972f1e0 100644 --- a/Common/DataModel/vtkClosestPointStrategy.cxx +++ b/Common/DataModel/vtkClosestPointStrategy.cxx @@ -21,6 +21,7 @@ #include "vtkPointSet.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkClosestPointStrategy); //------------------------------------------------------------------------------ @@ -406,3 +407,4 @@ void vtkClosestPointStrategy::PrintSelf(ostream& os, vtkIndent indent) os << indent << "PointLocator: " << this->PointLocator << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkClosestPointStrategy.h b/Common/DataModel/vtkClosestPointStrategy.h index 33e24d565a..999f6321db 100644 --- a/Common/DataModel/vtkClosestPointStrategy.h +++ b/Common/DataModel/vtkClosestPointStrategy.h @@ -40,6 +40,7 @@ #include // For tracking visited cells +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkAbstractPointLocator; @@ -148,4 +149,5 @@ inline vtkCell* vtkClosestPointStrategy::SelectCell( return cell; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkColor.h b/Common/DataModel/vtkColor.h index 4a04c8fc84..c7b762c21a 100644 --- a/Common/DataModel/vtkColor.h +++ b/Common/DataModel/vtkColor.h @@ -30,6 +30,7 @@ // .NAME vtkColor3 - templated base type for storage of 3 component colors. // +VTK_ABI_NAMESPACE_BEGIN template class vtkColor3 : public vtkTuple { @@ -338,5 +339,6 @@ public: } }; +VTK_ABI_NAMESPACE_END #endif // vtkColor_h // VTK-HeaderTest-Exclude: vtkColor.h diff --git a/Common/DataModel/vtkCompositeDataIterator.cxx b/Common/DataModel/vtkCompositeDataIterator.cxx index 7b772dbc73..90b31e7d49 100644 --- a/Common/DataModel/vtkCompositeDataIterator.cxx +++ b/Common/DataModel/vtkCompositeDataIterator.cxx @@ -17,6 +17,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkCompositeDataIterator::vtkCompositeDataIterator() { this->Reverse = 0; @@ -61,3 +62,4 @@ void vtkCompositeDataIterator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Reverse: " << (this->Reverse ? "On" : "Off") << endl; os << indent << "SkipEmptyNodes: " << (this->SkipEmptyNodes ? "On" : "Off") << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCompositeDataIterator.h b/Common/DataModel/vtkCompositeDataIterator.h index f496cc07c1..e61036b3f1 100644 --- a/Common/DataModel/vtkCompositeDataIterator.h +++ b/Common/DataModel/vtkCompositeDataIterator.h @@ -26,6 +26,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCompositeDataSet; class vtkCompositeDataSetInternals; class vtkCompositeDataSetIndex; @@ -131,4 +132,5 @@ private: void operator=(const vtkCompositeDataIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCompositeDataSet.cxx b/Common/DataModel/vtkCompositeDataSet.cxx index 01a293ff85..0ae73707d2 100644 --- a/Common/DataModel/vtkCompositeDataSet.cxx +++ b/Common/DataModel/vtkCompositeDataSet.cxx @@ -25,6 +25,7 @@ #include "vtkObjectFactory.h" #include "vtkSmartPointer.h" +VTK_ABI_NAMESPACE_BEGIN vtkInformationKeyMacro(vtkCompositeDataSet, NAME, String); vtkInformationKeyMacro(vtkCompositeDataSet, CURRENT_PROCESS_CAN_LOAD_BLOCK, Integer); @@ -170,3 +171,4 @@ void vtkCompositeDataSet::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCompositeDataSet.h b/Common/DataModel/vtkCompositeDataSet.h index 93e70eeb1a..86d742df69 100644 --- a/Common/DataModel/vtkCompositeDataSet.h +++ b/Common/DataModel/vtkCompositeDataSet.h @@ -38,6 +38,7 @@ #include // For GetDataSets +VTK_ABI_NAMESPACE_BEGIN class vtkCompositeDataIterator; class vtkCompositeDataSetInternals; class vtkDataSet; @@ -196,6 +197,7 @@ private: void operator=(const vtkCompositeDataSet&) = delete; }; +VTK_ABI_NAMESPACE_END #include "vtkCompositeDataSet.txx" // for template implementations #endif diff --git a/Common/DataModel/vtkCompositeDataSet.txx b/Common/DataModel/vtkCompositeDataSet.txx index fa502f20d9..c49a536f77 100644 --- a/Common/DataModel/vtkCompositeDataSet.txx +++ b/Common/DataModel/vtkCompositeDataSet.txx @@ -23,6 +23,7 @@ #define vtkCompositeDataSet_txx //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN template std::vector vtkCompositeDataSet::GetDataSets(vtkDataObject* dobj, bool preserveNull) { @@ -56,4 +57,5 @@ std::vector vtkCompositeDataSet::GetDataSets(vtkDataObject* dobj, boo return datasets; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCompositeDataSetNodeReference.h b/Common/DataModel/vtkCompositeDataSetNodeReference.h index 6a41e12cd4..67c3c905ff 100644 --- a/Common/DataModel/vtkCompositeDataSetNodeReference.h +++ b/Common/DataModel/vtkCompositeDataSetNodeReference.h @@ -25,9 +25,9 @@ namespace vtk { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // MTimeWatcher: @@ -85,8 +85,11 @@ template using DebugWeakPointer = ObjectType*; #endif +VTK_ABI_NAMESPACE_END } // end namespace detail +VTK_ABI_NAMESPACE_BEGIN + /** * A reference proxy into a vtkCompositeDataSet, obtained by dereferencing an * iterator from the vtk::Range(vtkCompositeDataSet*) overloads. @@ -265,6 +268,7 @@ public: } }; +VTK_ABI_NAMESPACE_END } // end namespace vtk #endif // vtkCompositeDataSetNodeReference_h diff --git a/Common/DataModel/vtkCompositeDataSetRange.h b/Common/DataModel/vtkCompositeDataSetRange.h index 3c22876c7c..1def6efcf3 100644 --- a/Common/DataModel/vtkCompositeDataSetRange.h +++ b/Common/DataModel/vtkCompositeDataSetRange.h @@ -27,6 +27,7 @@ namespace vtk { +VTK_ABI_NAMESPACE_BEGIN // Pass these to vtk::Range(cds, options): enum class CompositeDataSetOptions : unsigned int @@ -35,15 +36,18 @@ enum class CompositeDataSetOptions : unsigned int SkipEmptyNodes = 1 << 1 // Skip null datasets. }; +VTK_ABI_NAMESPACE_END } // end namespace vtk (for bitflag op definition) +VTK_ABI_NAMESPACE_BEGIN VTK_GENERATE_BITFLAG_OPS(vtk::CompositeDataSetOptions) +VTK_ABI_NAMESPACE_END namespace vtk { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN struct CompositeDataSetRange; struct CompositeDataSetIterator; @@ -263,6 +267,7 @@ private: CompositeDataSetOptions Options; }; +VTK_ABI_NAMESPACE_END } } // end namespace vtk::detail diff --git a/Common/DataModel/vtkCone.cxx b/Common/DataModel/vtkCone.cxx index 56f5b11f65..1bdc550431 100644 --- a/Common/DataModel/vtkCone.cxx +++ b/Common/DataModel/vtkCone.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCone); // Construct cone with angle of 45 degrees. @@ -46,3 +47,4 @@ void vtkCone::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Angle: " << this->Angle << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCone.h b/Common/DataModel/vtkCone.h index 052dd389ca..170771f516 100644 --- a/Common/DataModel/vtkCone.h +++ b/Common/DataModel/vtkCone.h @@ -34,6 +34,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkCone : public vtkImplicitFunction { public: @@ -77,4 +78,5 @@ private: void operator=(const vtkCone&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkConvexPointSet.cxx b/Common/DataModel/vtkConvexPointSet.cxx index 8c3a1a02d4..5fdcffb771 100644 --- a/Common/DataModel/vtkConvexPointSet.cxx +++ b/Common/DataModel/vtkConvexPointSet.cxx @@ -26,6 +26,7 @@ #include "vtkTetra.h" #include "vtkTriangle.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkConvexPointSet); //------------------------------------------------------------------------------ @@ -416,3 +417,4 @@ void vtkConvexPointSet::PrintSelf(ostream& os, vtkIndent indent) os << indent << "ParametricCoords: (null)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkConvexPointSet.h b/Common/DataModel/vtkConvexPointSet.h index 1d2a43f93f..67c2c492ef 100644 --- a/Common/DataModel/vtkConvexPointSet.h +++ b/Common/DataModel/vtkConvexPointSet.h @@ -33,6 +33,7 @@ #include "vtkCell3D.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkUnstructuredGrid; class vtkCellArray; class vtkTriangle; @@ -235,4 +236,5 @@ inline int vtkConvexPointSet::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCoordinateFrame.cxx b/Common/DataModel/vtkCoordinateFrame.cxx index 8576b741ec..a33415a125 100644 --- a/Common/DataModel/vtkCoordinateFrame.cxx +++ b/Common/DataModel/vtkCoordinateFrame.cxx @@ -21,6 +21,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCoordinateFrame); double vtkCoordinateFrame::EvaluateFunction(double x[3]) @@ -81,3 +82,4 @@ void vtkCoordinateFrame::PrintSelf(ostream& os, vtkIndent indent) os << indent << "ZAxis: " << this->ZAxis[0] << " " << this->ZAxis[1] << " " << this->ZAxis[2] << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCoordinateFrame.h b/Common/DataModel/vtkCoordinateFrame.h index 7ae29e2219..74a85a13cb 100644 --- a/Common/DataModel/vtkCoordinateFrame.h +++ b/Common/DataModel/vtkCoordinateFrame.h @@ -39,6 +39,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPlane; class vtkDataArray; @@ -104,4 +105,5 @@ private: void operator=(const vtkCoordinateFrame&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCubicLine.cxx b/Common/DataModel/vtkCubicLine.cxx index 9ca0667665..c9b30abd59 100644 --- a/Common/DataModel/vtkCubicLine.cxx +++ b/Common/DataModel/vtkCubicLine.cxx @@ -26,6 +26,7 @@ #include "vtkPointData.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCubicLine); //------------------------------------------------------------------------------ @@ -445,3 +446,4 @@ void vtkCubicLine::PrintSelf(ostream& os, vtkIndent indent) this->Superclass::PrintSelf(os, indent); os << indent << "Line: " << this->Line << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCubicLine.h b/Common/DataModel/vtkCubicLine.h index bc4ce6ba4f..a95925647d 100644 --- a/Common/DataModel/vtkCubicLine.h +++ b/Common/DataModel/vtkCubicLine.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkDoubleArray; @@ -132,4 +133,5 @@ inline int vtkCubicLine::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkCylinder.cxx b/Common/DataModel/vtkCylinder.cxx index 469bcade24..a5e46b3dc3 100644 --- a/Common/DataModel/vtkCylinder.cxx +++ b/Common/DataModel/vtkCylinder.cxx @@ -16,6 +16,7 @@ #include "vtkMath.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkCylinder); //------------------------------------------------------------------------------ @@ -116,3 +117,4 @@ void vtkCylinder::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Radius: " << this->Radius << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkCylinder.h b/Common/DataModel/vtkCylinder.h index 1d6a8fc840..10bb464b99 100644 --- a/Common/DataModel/vtkCylinder.h +++ b/Common/DataModel/vtkCylinder.h @@ -41,6 +41,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkCylinder : public vtkImplicitFunction { public: @@ -106,4 +107,5 @@ private: void operator=(const vtkCylinder&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataAssembly.cxx b/Common/DataModel/vtkDataAssembly.cxx index 6ff4cd260a..b7fc7e80cf 100644 --- a/Common/DataModel/vtkDataAssembly.cxx +++ b/Common/DataModel/vtkDataAssembly.cxx @@ -32,6 +32,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN static constexpr const char* DATASET_NODE_NAME = "dataset"; //============================================================================ @@ -1333,3 +1334,4 @@ void vtkDataAssembly::PrintSelf(ostream& os, vtkIndent indent) os << indent << "XML Representation : " << endl << endl; this->Internals->Document.save(os, " "); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataAssembly.h b/Common/DataModel/vtkDataAssembly.h index 39ff85f47d..32463927f1 100644 --- a/Common/DataModel/vtkDataAssembly.h +++ b/Common/DataModel/vtkDataAssembly.h @@ -125,6 +125,7 @@ #include // for std::string #include // for std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkDataAssemblyVisitor; class VTKCOMMONDATAMODEL_EXPORT vtkDataAssembly : public vtkObject @@ -474,4 +475,5 @@ private: std::unique_ptr Internals; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataAssemblyUtilities.cxx b/Common/DataModel/vtkDataAssemblyUtilities.cxx index d52a20a4aa..a3802ee452 100644 --- a/Common/DataModel/vtkDataAssemblyUtilities.cxx +++ b/Common/DataModel/vtkDataAssemblyUtilities.cxx @@ -35,6 +35,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN namespace { @@ -832,3 +833,4 @@ std::vector vtkDataAssemblyUtilities::GetSelectorsForCompositeIds( // use-case. return {}; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataAssemblyUtilities.h b/Common/DataModel/vtkDataAssemblyUtilities.h index dc96384061..dcc0cb8f2c 100644 --- a/Common/DataModel/vtkDataAssemblyUtilities.h +++ b/Common/DataModel/vtkDataAssemblyUtilities.h @@ -30,6 +30,7 @@ #include // for std::string #include // for std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkCompositeDataSet; class vtkDataAssembly; class vtkDataObject; @@ -135,4 +136,5 @@ private: void operator=(const vtkDataAssemblyUtilities&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataAssemblyVisitor.h b/Common/DataModel/vtkDataAssemblyVisitor.h index 72005b03b5..a9c32529cd 100644 --- a/Common/DataModel/vtkDataAssemblyVisitor.h +++ b/Common/DataModel/vtkDataAssemblyVisitor.h @@ -54,6 +54,7 @@ #include // for std::unique_ptr #include // for std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkDataAssembly; class VTKCOMMONDATAMODEL_EXPORT vtkDataAssemblyVisitor : public vtkObject @@ -121,4 +122,5 @@ private: friend class vtkDataAssembly; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataObject.cxx b/Common/DataModel/vtkDataObject.cxx index 2d04d7d62e..af1314e6cc 100644 --- a/Common/DataModel/vtkDataObject.cxx +++ b/Common/DataModel/vtkDataObject.cxx @@ -30,6 +30,7 @@ PURPOSE. See the above copyright notice for more information. #include "vtkObjectFactory.h" #include "vtkUnsignedCharArray.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDataObject); vtkCxxSetObjectMacro(vtkDataObject, Information, vtkInformation); @@ -696,3 +697,4 @@ vtkIdType vtkDataObject::GetNumberOfElements(int type) } return 0; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataObject.h b/Common/DataModel/vtkDataObject.h index 9ba87aeca4..33fb720164 100644 --- a/Common/DataModel/vtkDataObject.h +++ b/Common/DataModel/vtkDataObject.h @@ -37,6 +37,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractArray; class vtkDataSetAttributes; class vtkFieldData; @@ -441,4 +442,5 @@ private: void operator=(const vtkDataObject&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataObjectCollection.cxx b/Common/DataModel/vtkDataObjectCollection.cxx index 4112183bc2..edf79f2266 100644 --- a/Common/DataModel/vtkDataObjectCollection.cxx +++ b/Common/DataModel/vtkDataObjectCollection.cxx @@ -15,9 +15,11 @@ #include "vtkDataObjectCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDataObjectCollection); void vtkDataObjectCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataObjectCollection.h b/Common/DataModel/vtkDataObjectCollection.h index beedadad12..901d8fbd8b 100644 --- a/Common/DataModel/vtkDataObjectCollection.h +++ b/Common/DataModel/vtkDataObjectCollection.h @@ -28,6 +28,7 @@ #include "vtkDataObject.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkDataObjectCollection : public vtkCollection { public: @@ -72,4 +73,5 @@ private: void operator=(const vtkDataObjectCollection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataObjectTree.cxx b/Common/DataModel/vtkDataObjectTree.cxx index 0935876de6..b03f2838df 100644 --- a/Common/DataModel/vtkDataObjectTree.cxx +++ b/Common/DataModel/vtkDataObjectTree.cxx @@ -25,6 +25,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkDataObjectTree::vtkDataObjectTree() { this->Internals = new vtkDataObjectTreeInternals; @@ -663,3 +664,4 @@ void vtkDataObjectTree::PrintSelf(ostream& os, vtkIndent indent) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataObjectTree.h b/Common/DataModel/vtkDataObjectTree.h index b4588a35be..01e6aa396d 100644 --- a/Common/DataModel/vtkDataObjectTree.h +++ b/Common/DataModel/vtkDataObjectTree.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkCompositeDataSet.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCompositeDataIterator; class vtkDataObjectTreeIterator; class vtkDataObjectTreeInternals; @@ -224,4 +225,5 @@ private: void operator=(const vtkDataObjectTree&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataObjectTreeInternals.h b/Common/DataModel/vtkDataObjectTreeInternals.h index 266b6e1d21..e63731f57e 100644 --- a/Common/DataModel/vtkDataObjectTreeInternals.h +++ b/Common/DataModel/vtkDataObjectTreeInternals.h @@ -28,6 +28,7 @@ //----------------------------------------------------------------------------- // Item in the VectorOfDataObjects. +VTK_ABI_NAMESPACE_BEGIN struct vtkDataObjectTreeItem { vtkSmartPointer DataObject; @@ -57,6 +58,7 @@ class vtkDataObjectTreeIndex : public std::vector int IsValid() { return !this->empty(); } }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkDataObjectTreeInternals.h diff --git a/Common/DataModel/vtkDataObjectTreeIterator.cxx b/Common/DataModel/vtkDataObjectTreeIterator.cxx index fd9568a4c4..4c99aba5e0 100644 --- a/Common/DataModel/vtkDataObjectTreeIterator.cxx +++ b/Common/DataModel/vtkDataObjectTreeIterator.cxx @@ -18,6 +18,7 @@ #include "vtkDataObjectTreeInternals.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataObjectTreeIterator::vtkInternals { public: @@ -412,3 +413,4 @@ void vtkDataObjectTreeIterator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "SkipEmptyNodes: " << (this->SkipEmptyNodes ? "On" : "Off") << endl; os << indent << "CurrentFlatIndex: " << this->CurrentFlatIndex << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataObjectTreeIterator.h b/Common/DataModel/vtkDataObjectTreeIterator.h index 7644f035ed..1c46645809 100644 --- a/Common/DataModel/vtkDataObjectTreeIterator.h +++ b/Common/DataModel/vtkDataObjectTreeIterator.h @@ -27,6 +27,7 @@ #include "vtkCompositeDataIterator.h" #include "vtkSmartPointer.h" //to store data sets +VTK_ABI_NAMESPACE_BEGIN class vtkDataObjectTree; class vtkDataObjectTreeInternals; class vtkDataObjectTreeIndex; @@ -158,4 +159,5 @@ private: void UpdateLocation(); }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataObjectTreeRange.h b/Common/DataModel/vtkDataObjectTreeRange.h index 484a06c8d3..00a40218ed 100644 --- a/Common/DataModel/vtkDataObjectTreeRange.h +++ b/Common/DataModel/vtkDataObjectTreeRange.h @@ -27,6 +27,7 @@ namespace vtk { +VTK_ABI_NAMESPACE_BEGIN // Pass these to vtk::Range(cds, options): enum class DataObjectTreeOptions : unsigned int @@ -37,15 +38,18 @@ enum class DataObjectTreeOptions : unsigned int TraverseSubTree = 1 << 3, // Descend into child composite datasets. }; +VTK_ABI_NAMESPACE_END } // end namespace vtk (for bitflag op definition) +VTK_ABI_NAMESPACE_BEGIN VTK_GENERATE_BITFLAG_OPS(vtk::DataObjectTreeOptions) +VTK_ABI_NAMESPACE_END namespace vtk { - namespace detail { +VTK_ABI_NAMESPACE_BEGIN struct DataObjectTreeRange; struct DataObjectTreeIterator; @@ -261,6 +265,7 @@ private: DataObjectTreeOptions Options; }; +VTK_ABI_NAMESPACE_END } } // end namespace vtk::detail diff --git a/Common/DataModel/vtkDataObjectTypes.cxx b/Common/DataModel/vtkDataObjectTypes.cxx index 2a7a87000f..44daa15080 100644 --- a/Common/DataModel/vtkDataObjectTypes.cxx +++ b/Common/DataModel/vtkDataObjectTypes.cxx @@ -56,6 +56,7 @@ PURPOSE. See the above copyright notice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDataObjectTypes); // This list should contain the data object class names in @@ -423,3 +424,4 @@ int vtkDataObjectTypes::GetCommonBaseTypeId(int typeA, int typeB) } return baseType; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataObjectTypes.h b/Common/DataModel/vtkDataObjectTypes.h index cfe9e262d4..0648a5db53 100644 --- a/Common/DataModel/vtkDataObjectTypes.h +++ b/Common/DataModel/vtkDataObjectTypes.h @@ -30,6 +30,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataObject; class VTKCOMMONDATAMODEL_EXPORT vtkDataObjectTypes : public vtkObject @@ -90,4 +91,5 @@ private: void operator=(const vtkDataObjectTypes&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataSet.cxx b/Common/DataModel/vtkDataSet.cxx index ab5d10baa7..f92d535946 100644 --- a/Common/DataModel/vtkDataSet.cxx +++ b/Common/DataModel/vtkDataSet.cxx @@ -44,6 +44,7 @@ //------------------------------------------------------------------------------ // Constructor with default bounds (0,1, 0,1, 0,1). +VTK_ABI_NAMESPACE_BEGIN vtkDataSet::vtkDataSet() { vtkMath::UninitializeBounds(this->Bounds); @@ -1041,3 +1042,4 @@ void vtkDataSet::OnDataModified(vtkObject* source, unsigned long, void* clientda This->UpdateCellGhostArrayCache(); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataSet.h b/Common/DataModel/vtkDataSet.h index 94efcd90cb..56dc5186f0 100644 --- a/Common/DataModel/vtkDataSet.h +++ b/Common/DataModel/vtkDataSet.h @@ -44,6 +44,7 @@ #include "vtkDataObject.h" #include "vtkDeprecation.h" // for VTK_DEPRECATED_IN_9_3_0 +VTK_ABI_NAMESPACE_BEGIN class vtkCell; class vtkCellData; class vtkCellIterator; @@ -573,4 +574,5 @@ inline void vtkDataSet::GetPoint(vtkIdType id, double x[3]) x[2] = pt[2]; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataSetAttributes.cxx b/Common/DataModel/vtkDataSetAttributes.cxx index 8b349fc0ab..76a6c8de67 100644 --- a/Common/DataModel/vtkDataSetAttributes.cxx +++ b/Common/DataModel/vtkDataSetAttributes.cxx @@ -25,6 +25,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ static constexpr const vtkIdType SMP_THRESHOLD = 10000; @@ -1937,3 +1938,4 @@ const char* vtkDataSetAttributes::GetLongAttributeTypeAsString(int attributeType } return vtkDataSetAttributes::LongAttributeNames[attributeType]; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataSetAttributes.h b/Common/DataModel/vtkDataSetAttributes.h index a9e17e1a4f..432c5fcb8d 100644 --- a/Common/DataModel/vtkDataSetAttributes.h +++ b/Common/DataModel/vtkDataSetAttributes.h @@ -55,6 +55,7 @@ #include "vtkDataSetAttributesFieldList.h" // for vtkDataSetAttributesFieldList #include "vtkFieldData.h" +VTK_ABI_NAMESPACE_BEGIN class vtkLookupTable; class VTKCOMMONDATAMODEL_EXPORT vtkDataSetAttributes : public vtkFieldData @@ -679,4 +680,5 @@ private: friend class vtkDataSetAttributesFieldList; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDataSetAttributesFieldList.cxx b/Common/DataModel/vtkDataSetAttributesFieldList.cxx index 5ed50b5b43..d5de99f593 100644 --- a/Common/DataModel/vtkDataSetAttributesFieldList.cxx +++ b/Common/DataModel/vtkDataSetAttributesFieldList.cxx @@ -32,6 +32,7 @@ namespace detail { +VTK_ABI_NAMESPACE_BEGIN /** * FieldInfo is used to store metadata about a field. */ @@ -301,8 +302,11 @@ void remove_if(Container& cont, ForwardIt first, ForwardIt second, UnaryPredicat } } } +VTK_ABI_NAMESPACE_END } // namespace detail +VTK_ABI_NAMESPACE_BEGIN + class vtkDataSetAttributesFieldList::vtkInternals { public: @@ -827,3 +831,4 @@ void vtkDataSetAttributesFieldList::PrintSelf(ostream& os, vtkIndent indent) pair.second.PrintSelf(os, indent.GetNextIndent()); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataSetAttributesFieldList.h b/Common/DataModel/vtkDataSetAttributesFieldList.h index 06fc90e78a..7619a71088 100644 --- a/Common/DataModel/vtkDataSetAttributesFieldList.h +++ b/Common/DataModel/vtkDataSetAttributesFieldList.h @@ -62,6 +62,7 @@ #include // for std::function #include // for unique_ptr +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractArray; class vtkDataSetAttributes; class vtkIdList; @@ -161,5 +162,6 @@ private: void operator=(vtkDataSetAttributesFieldList&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkDataSetAttributesFieldList.h diff --git a/Common/DataModel/vtkDataSetCellIterator.cxx b/Common/DataModel/vtkDataSetCellIterator.cxx index f3897c01f8..1e9b6949e1 100644 --- a/Common/DataModel/vtkDataSetCellIterator.cxx +++ b/Common/DataModel/vtkDataSetCellIterator.cxx @@ -21,6 +21,7 @@ #include "vtkPoints.h" #include "vtkRectilinearGrid.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDataSetCellIterator); namespace @@ -207,3 +208,4 @@ void vtkDataSetCellIterator::FetchPoints() this->Points->SetPoint(i, point); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataSetCellIterator.h b/Common/DataModel/vtkDataSetCellIterator.h index 8dafcc98a8..9e5f4401af 100644 --- a/Common/DataModel/vtkDataSetCellIterator.h +++ b/Common/DataModel/vtkDataSetCellIterator.h @@ -25,6 +25,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkSmartPointer.h" // For vtkSmartPointer +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class VTKCOMMONDATAMODEL_EXPORT vtkDataSetCellIterator : public vtkCellIterator @@ -58,4 +59,5 @@ private: void operator=(const vtkDataSetCellIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkDataSetCellIterator_h diff --git a/Common/DataModel/vtkDataSetCollection.cxx b/Common/DataModel/vtkDataSetCollection.cxx index 8709650435..7a7c3dd72f 100644 --- a/Common/DataModel/vtkDataSetCollection.cxx +++ b/Common/DataModel/vtkDataSetCollection.cxx @@ -15,9 +15,11 @@ #include "vtkDataSetCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDataSetCollection); void vtkDataSetCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDataSetCollection.h b/Common/DataModel/vtkDataSetCollection.h index 97118afe48..0792a2bb84 100644 --- a/Common/DataModel/vtkDataSetCollection.h +++ b/Common/DataModel/vtkDataSetCollection.h @@ -28,6 +28,7 @@ #include "vtkDataSet.h" // Needed for inline methods. +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkDataSetCollection : public vtkCollection { public: @@ -78,4 +79,5 @@ private: void operator=(const vtkDataSetCollection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDirectedAcyclicGraph.cxx b/Common/DataModel/vtkDirectedAcyclicGraph.cxx index d7cb2f011e..c87f27efc3 100644 --- a/Common/DataModel/vtkDirectedAcyclicGraph.cxx +++ b/Common/DataModel/vtkDirectedAcyclicGraph.cxx @@ -28,6 +28,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDirectedAcyclicGraph); //------------------------------------------------------------------------------ vtkDirectedAcyclicGraph::vtkDirectedAcyclicGraph() = default; @@ -122,3 +123,4 @@ void vtkDirectedAcyclicGraph::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDirectedAcyclicGraph.h b/Common/DataModel/vtkDirectedAcyclicGraph.h index 6017f9c2fc..a7578ae20f 100644 --- a/Common/DataModel/vtkDirectedAcyclicGraph.h +++ b/Common/DataModel/vtkDirectedAcyclicGraph.h @@ -49,6 +49,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDirectedGraph.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdTypeArray; class VTKCOMMONDATAMODEL_EXPORT vtkDirectedAcyclicGraph : public vtkDirectedGraph @@ -86,4 +87,5 @@ private: void operator=(const vtkDirectedAcyclicGraph&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDirectedGraph.cxx b/Common/DataModel/vtkDirectedGraph.cxx index 199005131f..27703da130 100644 --- a/Common/DataModel/vtkDirectedGraph.cxx +++ b/Common/DataModel/vtkDirectedGraph.cxx @@ -32,6 +32,7 @@ //------------------------------------------------------------------------------ // class vtkDirectedGraph //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkDirectedGraph); //------------------------------------------------------------------------------ vtkDirectedGraph::vtkDirectedGraph() = default; @@ -107,3 +108,4 @@ void vtkDirectedGraph::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDirectedGraph.h b/Common/DataModel/vtkDirectedGraph.h index 24b889ec89..1eca8ab20b 100644 --- a/Common/DataModel/vtkDirectedGraph.h +++ b/Common/DataModel/vtkDirectedGraph.h @@ -41,6 +41,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkGraph.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkDirectedGraph : public vtkGraph { public: @@ -77,4 +78,5 @@ private: void operator=(const vtkDirectedGraph&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkDistributedGraphHelper.cxx b/Common/DataModel/vtkDistributedGraphHelper.cxx index aecd6b3ca3..9dbec35bcd 100644 --- a/Common/DataModel/vtkDistributedGraphHelper.cxx +++ b/Common/DataModel/vtkDistributedGraphHelper.cxx @@ -30,6 +30,7 @@ #include // assert() #include // CHAR_BIT +VTK_ABI_NAMESPACE_BEGIN vtkInformationKeyMacro(vtkDistributedGraphHelper, DISTRIBUTEDVERTEXIDS, Integer); vtkInformationKeyMacro(vtkDistributedGraphHelper, DISTRIBUTEDEDGEIDS, Integer); @@ -232,3 +233,4 @@ vtkIdType vtkDistributedGraphHelper::GetVertexOwnerByPedigreeId(const vtkVariant return hash % numProcs; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkDistributedGraphHelper.h b/Common/DataModel/vtkDistributedGraphHelper.h index 3f2b53129c..c8f599aac6 100644 --- a/Common/DataModel/vtkDistributedGraphHelper.h +++ b/Common/DataModel/vtkDistributedGraphHelper.h @@ -56,6 +56,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDistributedGraphHelperInternals; struct vtkEdgeType; class vtkGraph; @@ -272,4 +273,5 @@ private: friend class vtkGraph; }; +VTK_ABI_NAMESPACE_END #endif // vtkDistributedGraphHelper_h diff --git a/Common/DataModel/vtkEdgeListIterator.cxx b/Common/DataModel/vtkEdgeListIterator.cxx index d325e92ae2..bec1b7369f 100644 --- a/Common/DataModel/vtkEdgeListIterator.cxx +++ b/Common/DataModel/vtkEdgeListIterator.cxx @@ -27,6 +27,7 @@ #include "vtkInformation.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkEdgeListIterator); //------------------------------------------------------------------------------ vtkEdgeListIterator::vtkEdgeListIterator() @@ -209,3 +210,4 @@ void vtkEdgeListIterator::PrintSelf(ostream& os, vtkIndent indent) this->Graph->PrintSelf(os, indent.GetNextIndent()); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkEdgeListIterator.h b/Common/DataModel/vtkEdgeListIterator.h index c4cab85688..ce9f99e3ad 100644 --- a/Common/DataModel/vtkEdgeListIterator.h +++ b/Common/DataModel/vtkEdgeListIterator.h @@ -41,6 +41,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGraph; class vtkGraphEdge; @@ -94,4 +95,5 @@ private: void operator=(const vtkEdgeListIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkEdgeTable.cxx b/Common/DataModel/vtkEdgeTable.cxx index eba2281420..47e51792e9 100644 --- a/Common/DataModel/vtkEdgeTable.cxx +++ b/Common/DataModel/vtkEdgeTable.cxx @@ -18,6 +18,7 @@ #include "vtkPoints.h" #include "vtkVoidArray.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkEdgeTable); //------------------------------------------------------------------------------ @@ -596,3 +597,4 @@ void vtkEdgeTable::PrintSelf(ostream& os, vtkIndent indent) os << indent << "NumberOfEdges: " << this->GetNumberOfEdges() << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkEdgeTable.h b/Common/DataModel/vtkEdgeTable.h index 0e18021536..519f759d76 100644 --- a/Common/DataModel/vtkEdgeTable.h +++ b/Common/DataModel/vtkEdgeTable.h @@ -33,6 +33,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkPoints; class vtkVoidArray; @@ -186,4 +187,5 @@ private: void operator=(const vtkEdgeTable&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkEmptyCell.cxx b/Common/DataModel/vtkEmptyCell.cxx index 7dd7a1c70f..66b11b7004 100644 --- a/Common/DataModel/vtkEmptyCell.cxx +++ b/Common/DataModel/vtkEmptyCell.cxx @@ -19,6 +19,7 @@ #include "vtkObjectFactory.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkEmptyCell); //------------------------------------------------------------------------------ @@ -96,3 +97,4 @@ void vtkEmptyCell::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkEmptyCell.h b/Common/DataModel/vtkEmptyCell.h index cffc74c2e7..35111be6bd 100644 --- a/Common/DataModel/vtkEmptyCell.h +++ b/Common/DataModel/vtkEmptyCell.h @@ -26,6 +26,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkEmptyCell : public vtkCell { public: @@ -70,4 +71,5 @@ private: void operator=(const vtkEmptyCell&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkExplicitStructuredGrid.cxx b/Common/DataModel/vtkExplicitStructuredGrid.cxx index 3941d45fb6..e38097d727 100644 --- a/Common/DataModel/vtkExplicitStructuredGrid.cxx +++ b/Common/DataModel/vtkExplicitStructuredGrid.cxx @@ -34,6 +34,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN static const unsigned char MASKED_CELL_VALUE = vtkDataSetAttributes::HIDDENCELL | vtkDataSetAttributes::REFINEDCELL; @@ -1252,3 +1253,4 @@ void vtkExplicitStructuredGrid::ReorderCellsPoints(const int* ptsMap, const int } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkExplicitStructuredGrid.h b/Common/DataModel/vtkExplicitStructuredGrid.h index 377c65d365..67f8f7ff10 100644 --- a/Common/DataModel/vtkExplicitStructuredGrid.h +++ b/Common/DataModel/vtkExplicitStructuredGrid.h @@ -59,6 +59,7 @@ #include "vtkPointSet.h" #include "vtkStructuredData.h" // For static method usage +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkAbstractCellLinks; class vtkEmptyCell; @@ -435,4 +436,5 @@ inline vtkIdType vtkExplicitStructuredGrid::ComputeCellId(int i, int j, int k, b return vtkStructuredData::ComputeCellId(dims, ijk); } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkExtractStructuredGridHelper.cxx b/Common/DataModel/vtkExtractStructuredGridHelper.cxx index 3456fc9f71..03822ae1b5 100644 --- a/Common/DataModel/vtkExtractStructuredGridHelper.cxx +++ b/Common/DataModel/vtkExtractStructuredGridHelper.cxx @@ -49,6 +49,7 @@ namespace vtk { namespace detail { +VTK_ABI_NAMESPACE_BEGIN // Index mapping works as: // inputExtent = Mapping[dim][outputExtent - this->OutputWholeExtent[2*dim]] @@ -57,9 +58,11 @@ struct vtkIndexMap std::vector Mapping[3]; }; +VTK_ABI_NAMESPACE_END } // End namespace detail } // End namespace vtk +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkExtractStructuredGridHelper); //------------------------------------------------------------------------------ @@ -257,6 +260,7 @@ int vtkExtractStructuredGridHelper::GetSize(const int dim) assert("pre: dimension dim is out-of-bounds!" && (dim >= 0) && (dim < 3)); return (static_cast(this->IndexMap->Mapping[dim].size())); } +VTK_ABI_NAMESPACE_END //------------------------------------------------------------------------------ namespace @@ -267,6 +271,7 @@ int roundToInt(double r) } } +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ void vtkExtractStructuredGridHelper::ComputeBeginAndEnd( int inExt[6], int voi[6], int begin[3], int end[3]) @@ -657,3 +662,4 @@ void vtkExtractStructuredGridHelper::GetPartitionedOutputExtent(const int global } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkExtractStructuredGridHelper.h b/Common/DataModel/vtkExtractStructuredGridHelper.h index ea2f8dda2f..2c07cef8c8 100644 --- a/Common/DataModel/vtkExtractStructuredGridHelper.h +++ b/Common/DataModel/vtkExtractStructuredGridHelper.h @@ -34,20 +34,25 @@ #include "vtkObject.h" // Forward declarations +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkPointData; class vtkPoints; +VTK_ABI_NAMESPACE_END namespace vtk { namespace detail { +VTK_ABI_NAMESPACE_BEGIN struct vtkIndexMap; +VTK_ABI_NAMESPACE_END } // END namespace detail } // END namespace vtk +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkExtractStructuredGridHelper : public vtkObject { public: @@ -227,4 +232,5 @@ private: void operator=(const vtkExtractStructuredGridHelper&) = delete; }; +VTK_ABI_NAMESPACE_END #endif /* VTKEXTRACTSTRUCTUREDGRIDHELPER_H_ */ diff --git a/Common/DataModel/vtkFieldData.cxx b/Common/DataModel/vtkFieldData.cxx index 52b35383e5..63b4f24dd6 100644 --- a/Common/DataModel/vtkFieldData.cxx +++ b/Common/DataModel/vtkFieldData.cxx @@ -28,6 +28,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkFieldData); vtkStandardExtendedNewMacro(vtkFieldData); @@ -1085,3 +1086,4 @@ vtkIdType vtkFieldData::InsertNextTuple(const vtkIdType j, vtkFieldData* source) this->InsertTuple(id, j, source); return id; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkFieldData.h b/Common/DataModel/vtkFieldData.h index c3b9c7163e..b7c41a2aba 100644 --- a/Common/DataModel/vtkFieldData.h +++ b/Common/DataModel/vtkFieldData.h @@ -52,8 +52,9 @@ #include // For CachedGhostRangeType #include // For list indices -class vtkDoubleArray; +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; +class vtkDoubleArray; class vtkUnsignedCharArray; class VTKCOMMONDATAMODEL_EXPORT vtkFieldData : public vtkObject @@ -558,4 +559,5 @@ public: }; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkFindCellStrategy.cxx b/Common/DataModel/vtkFindCellStrategy.cxx index 1a7aa0abc0..6169c627b4 100644 --- a/Common/DataModel/vtkFindCellStrategy.cxx +++ b/Common/DataModel/vtkFindCellStrategy.cxx @@ -18,6 +18,7 @@ #include "vtkPointSet.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkFindCellStrategy::vtkFindCellStrategy() { this->PointSet = nullptr; @@ -60,3 +61,4 @@ void vtkFindCellStrategy::PrintSelf(ostream& os, vtkIndent indent) os << indent << "vtkPointSet: " << this->PointSet << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkFindCellStrategy.h b/Common/DataModel/vtkFindCellStrategy.h index 47d623ecf6..3103446b33 100644 --- a/Common/DataModel/vtkFindCellStrategy.h +++ b/Common/DataModel/vtkFindCellStrategy.h @@ -51,6 +51,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCell; class vtkGenericCell; class vtkPointSet; @@ -142,4 +143,5 @@ private: void operator=(const vtkFindCellStrategy&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericAdaptorCell.cxx b/Common/DataModel/vtkGenericAdaptorCell.cxx index 995032af41..770dd13d93 100644 --- a/Common/DataModel/vtkGenericAdaptorCell.cxx +++ b/Common/DataModel/vtkGenericAdaptorCell.cxx @@ -38,6 +38,7 @@ #include "vtkVertex.h" #include "vtkWedge.h" +VTK_ABI_NAMESPACE_BEGIN vtkGenericAdaptorCell::vtkGenericAdaptorCell() { this->Tetra = vtkTetra::New(); @@ -1078,3 +1079,4 @@ void vtkGenericAdaptorCell::AllocateTuples(int size) this->TuplesCapacity = size; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericAdaptorCell.h b/Common/DataModel/vtkGenericAdaptorCell.h index 829cfaac5f..a3fe995f33 100644 --- a/Common/DataModel/vtkGenericAdaptorCell.h +++ b/Common/DataModel/vtkGenericAdaptorCell.h @@ -62,6 +62,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkTetra; class vtkPoints; @@ -622,4 +623,5 @@ private: void operator=(const vtkGenericAdaptorCell&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericAttribute.cxx b/Common/DataModel/vtkGenericAttribute.cxx index bd5f741a18..12a21542cb 100644 --- a/Common/DataModel/vtkGenericAttribute.cxx +++ b/Common/DataModel/vtkGenericAttribute.cxx @@ -19,6 +19,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkGenericAttribute::vtkGenericAttribute() = default; //------------------------------------------------------------------------------ @@ -50,3 +51,4 @@ void vtkGenericAttribute::PrintSelf(ostream& os, vtkIndent indent) } os << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericAttribute.h b/Common/DataModel/vtkGenericAttribute.h index 5c7b030d86..6314c76b2f 100644 --- a/Common/DataModel/vtkGenericAttribute.h +++ b/Common/DataModel/vtkGenericAttribute.h @@ -33,6 +33,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericCellIterator; class vtkGenericAdaptorCell; class vtkGenericPointIterator; @@ -222,4 +223,5 @@ private: void operator=(const vtkGenericAttribute&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericAttributeCollection.cxx b/Common/DataModel/vtkGenericAttributeCollection.cxx index 0414ae8db6..e7f5072618 100644 --- a/Common/DataModel/vtkGenericAttributeCollection.cxx +++ b/Common/DataModel/vtkGenericAttributeCollection.cxx @@ -21,6 +21,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkGenericAttributeCollection); class vtkGenericAttributeInternalVector @@ -518,3 +519,4 @@ void vtkGenericAttributeCollection::SetAttributesToInterpolateToAll() // *** ALL THE PREVIOUS METHODS SHOULD BE REMOVED WHEN vtkInformation // will be ready. // *** END +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericAttributeCollection.h b/Common/DataModel/vtkGenericAttributeCollection.h index 8666119086..49c3a1b5ad 100644 --- a/Common/DataModel/vtkGenericAttributeCollection.h +++ b/Common/DataModel/vtkGenericAttributeCollection.h @@ -26,6 +26,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericAttributeInternalVector; class vtkIntInternalVector; class vtkGenericAttribute; @@ -278,4 +279,5 @@ private: vtkGenericAttributeCollection(const vtkGenericAttributeCollection&) = delete; void operator=(const vtkGenericAttributeCollection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericCell.cxx b/Common/DataModel/vtkGenericCell.cxx index a64f145dba..3509bab0e6 100644 --- a/Common/DataModel/vtkGenericCell.cxx +++ b/Common/DataModel/vtkGenericCell.cxx @@ -67,6 +67,7 @@ #include "vtkVoxel.h" #include "vtkWedge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkGenericCell); //------------------------------------------------------------------------------ @@ -497,3 +498,4 @@ void vtkGenericCell::SetPointIds(vtkIdList* pointIds) this->Cell->PointIds->Register(this); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericCell.h b/Common/DataModel/vtkGenericCell.h index 679289c5df..ed5c5b549e 100644 --- a/Common/DataModel/vtkGenericCell.h +++ b/Common/DataModel/vtkGenericCell.h @@ -33,6 +33,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkGenericCell : public vtkCell { public: @@ -185,4 +186,5 @@ private: void operator=(const vtkGenericCell&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericCellIterator.cxx b/Common/DataModel/vtkGenericCellIterator.cxx index 94038089a0..774bca2bb2 100644 --- a/Common/DataModel/vtkGenericCellIterator.cxx +++ b/Common/DataModel/vtkGenericCellIterator.cxx @@ -15,6 +15,7 @@ #include "vtkGenericCellIterator.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkGenericCellIterator::vtkGenericCellIterator() = default; //------------------------------------------------------------------------------ @@ -25,3 +26,4 @@ void vtkGenericCellIterator::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericCellIterator.h b/Common/DataModel/vtkGenericCellIterator.h index 76f7f6126b..2ba16a676f 100644 --- a/Common/DataModel/vtkGenericCellIterator.h +++ b/Common/DataModel/vtkGenericCellIterator.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericAdaptorCell; class VTKCOMMONDATAMODEL_EXPORT vtkGenericCellIterator : public vtkObject @@ -97,4 +98,5 @@ private: void operator=(const vtkGenericCellIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericCellTessellator.cxx b/Common/DataModel/vtkGenericCellTessellator.cxx index ddf97ef21f..27805dd5cf 100644 --- a/Common/DataModel/vtkGenericCellTessellator.cxx +++ b/Common/DataModel/vtkGenericCellTessellator.cxx @@ -32,6 +32,7 @@ #include "vtkMath.h" +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkGenericCellTessellator, ErrorMetrics, vtkCollection); //------------------------------------------------------------------------------ @@ -226,3 +227,4 @@ void vtkGenericCellTessellator::SetGenericCell(vtkGenericAdaptorCell* cell) e = static_cast(this->ErrorMetrics->GetNextItemAsObject()); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericCellTessellator.h b/Common/DataModel/vtkGenericCellTessellator.h index 83fb942e53..dbfe93127c 100644 --- a/Common/DataModel/vtkGenericCellTessellator.h +++ b/Common/DataModel/vtkGenericCellTessellator.h @@ -43,6 +43,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkDoubleArray; class vtkCollection; @@ -211,4 +212,5 @@ private: void operator=(const vtkGenericCellTessellator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericDataSet.cxx b/Common/DataModel/vtkGenericDataSet.cxx index 581803431b..e2f525cf99 100644 --- a/Common/DataModel/vtkGenericDataSet.cxx +++ b/Common/DataModel/vtkGenericDataSet.cxx @@ -25,6 +25,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkGenericDataSet, Tessellator, vtkGenericCellTessellator); //------------------------------------------------------------------------------ @@ -233,3 +234,4 @@ vtkGenericDataSet* vtkGenericDataSet::GetData(vtkInformationVector* v, int i) { return vtkGenericDataSet::GetData(v->GetInformationObject(i)); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericDataSet.h b/Common/DataModel/vtkGenericDataSet.h index 83449ff5bc..dceafcbdcb 100644 --- a/Common/DataModel/vtkGenericDataSet.h +++ b/Common/DataModel/vtkGenericDataSet.h @@ -60,6 +60,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCellTypes; class vtkGenericCellIterator; class vtkGenericAttributeCollection; @@ -303,4 +304,5 @@ private: void operator=(const vtkGenericDataSet&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericEdgeTable.cxx b/Common/DataModel/vtkGenericEdgeTable.cxx index b6464d9014..1fd13c4894 100644 --- a/Common/DataModel/vtkGenericEdgeTable.cxx +++ b/Common/DataModel/vtkGenericEdgeTable.cxx @@ -19,6 +19,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkGenericEdgeTable); static int PRIME_NUMBERS[] = { 1, 3, 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093 }; @@ -742,3 +743,4 @@ void vtkGenericEdgeTable::LoadFactor() this->EdgeTable->LoadFactor(); this->HashPoints->LoadFactor(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericEdgeTable.h b/Common/DataModel/vtkGenericEdgeTable.h index dccb65f6a2..410c040823 100644 --- a/Common/DataModel/vtkGenericEdgeTable.h +++ b/Common/DataModel/vtkGenericEdgeTable.h @@ -33,6 +33,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkEdgeTableEdge; class vtkEdgeTablePoints; @@ -275,4 +276,5 @@ private: void operator=(const vtkGenericEdgeTable&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericInterpolatedVelocityField.cxx b/Common/DataModel/vtkGenericInterpolatedVelocityField.cxx index 0348fda13b..6a625c0c11 100644 --- a/Common/DataModel/vtkGenericInterpolatedVelocityField.cxx +++ b/Common/DataModel/vtkGenericInterpolatedVelocityField.cxx @@ -24,6 +24,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkGenericInterpolatedVelocityField); typedef std::vector DataSetsTypeBase; @@ -308,3 +309,4 @@ void vtkGenericInterpolatedVelocityField::PrintSelf(ostream& os, vtkIndent inden << endl; os << indent << "LastDataSet : " << this->LastDataSet << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericInterpolatedVelocityField.h b/Common/DataModel/vtkGenericInterpolatedVelocityField.h index 5aea53a01a..c222c5b5a3 100644 --- a/Common/DataModel/vtkGenericInterpolatedVelocityField.h +++ b/Common/DataModel/vtkGenericInterpolatedVelocityField.h @@ -45,6 +45,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkFunctionSet.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericDataSet; class vtkGenericCellIterator; class vtkGenericAdaptorCell; @@ -168,4 +169,5 @@ private: void operator=(const vtkGenericInterpolatedVelocityField&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericPointIterator.cxx b/Common/DataModel/vtkGenericPointIterator.cxx index 1ddd9719af..4ae25befc2 100644 --- a/Common/DataModel/vtkGenericPointIterator.cxx +++ b/Common/DataModel/vtkGenericPointIterator.cxx @@ -15,6 +15,7 @@ #include "vtkGenericPointIterator.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkGenericPointIterator::vtkGenericPointIterator() = default; //------------------------------------------------------------------------------ @@ -25,3 +26,4 @@ void vtkGenericPointIterator::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericPointIterator.h b/Common/DataModel/vtkGenericPointIterator.h index 61b32e6fb9..f62629b6ab 100644 --- a/Common/DataModel/vtkGenericPointIterator.h +++ b/Common/DataModel/vtkGenericPointIterator.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkGenericPointIterator : public vtkObject { public: @@ -97,4 +98,5 @@ private: void operator=(const vtkGenericPointIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGenericSubdivisionErrorMetric.cxx b/Common/DataModel/vtkGenericSubdivisionErrorMetric.cxx index 30b86304d6..d5289325b8 100644 --- a/Common/DataModel/vtkGenericSubdivisionErrorMetric.cxx +++ b/Common/DataModel/vtkGenericSubdivisionErrorMetric.cxx @@ -23,6 +23,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkGenericSubdivisionErrorMetric::vtkGenericSubdivisionErrorMetric() { this->GenericCell = nullptr; @@ -56,3 +57,4 @@ void vtkGenericSubdivisionErrorMetric::PrintSelf(ostream& os, vtkIndent indent) os << indent << "GenericCell: " << this->GenericCell << endl; os << indent << "DataSet: " << this->DataSet << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGenericSubdivisionErrorMetric.h b/Common/DataModel/vtkGenericSubdivisionErrorMetric.h index e3da02ad63..cf62962d44 100644 --- a/Common/DataModel/vtkGenericSubdivisionErrorMetric.h +++ b/Common/DataModel/vtkGenericSubdivisionErrorMetric.h @@ -41,6 +41,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericAttributeCollection; class vtkGenericAdaptorCell; class vtkGenericDataSet; @@ -121,4 +122,5 @@ private: void operator=(const vtkGenericSubdivisionErrorMetric&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGeometricErrorMetric.cxx b/Common/DataModel/vtkGeometricErrorMetric.cxx index 5da6fc2bdc..f0802f8c5b 100644 --- a/Common/DataModel/vtkGeometricErrorMetric.cxx +++ b/Common/DataModel/vtkGeometricErrorMetric.cxx @@ -22,6 +22,7 @@ #include "vtkObjectFactory.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkGeometricErrorMetric); //------------------------------------------------------------------------------ @@ -233,3 +234,4 @@ void vtkGeometricErrorMetric::PrintSelf(ostream& os, vtkIndent indent) os << indent << "AbsoluteGeometricTolerance: " << this->AbsoluteGeometricTolerance << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGeometricErrorMetric.h b/Common/DataModel/vtkGeometricErrorMetric.h index 44f22d6781..e6ad8e0f51 100644 --- a/Common/DataModel/vtkGeometricErrorMetric.h +++ b/Common/DataModel/vtkGeometricErrorMetric.h @@ -31,6 +31,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkGenericSubdivisionErrorMetric.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericDataSet; class VTKCOMMONDATAMODEL_EXPORT vtkGeometricErrorMetric : public vtkGenericSubdivisionErrorMetric @@ -139,4 +140,5 @@ private: void operator=(const vtkGeometricErrorMetric&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGraph.cxx b/Common/DataModel/vtkGraph.cxx index 399be00635..4d5efba18d 100644 --- a/Common/DataModel/vtkGraph.cxx +++ b/Common/DataModel/vtkGraph.cxx @@ -49,6 +49,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN double vtkGraph::DefaultPoint[3] = { 0, 0, 0 }; //------------------------------------------------------------------------------ @@ -2005,3 +2006,4 @@ ostream& operator<<(ostream& out, vtkEdgeBase e) { return out << e.Id; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGraph.h b/Common/DataModel/vtkGraph.h index 12503d2b05..ef5ed79e96 100644 --- a/Common/DataModel/vtkGraph.h +++ b/Common/DataModel/vtkGraph.h @@ -213,6 +213,16 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +// Forward declare some boost stuff even if boost wrappers +// are turned off. +namespace boost +{ +class vtk_edge_iterator; +class vtk_out_edge_pointer_iterator; +class vtk_in_edge_pointer_iterator; +} + +VTK_ABI_NAMESPACE_BEGIN class vtkAdjacentVertexIterator; class vtkCellArray; class vtkEdgeListIterator; @@ -231,15 +241,6 @@ class vtkVertexListIterator; class vtkVariant; class vtkVariantArray; -// Forward declare some boost stuff even if boost wrappers -// are turned off. -namespace boost -{ -class vtk_edge_iterator; -class vtk_out_edge_pointer_iterator; -class vtk_in_edge_pointer_iterator; -} - // Edge structures. struct vtkEdgeBase { @@ -837,4 +838,5 @@ bool VTKCOMMONDATAMODEL_EXPORT operator==(vtkEdgeBase e1, vtkEdgeBase e2); bool VTKCOMMONDATAMODEL_EXPORT operator!=(vtkEdgeBase e1, vtkEdgeBase e2); VTKCOMMONDATAMODEL_EXPORT ostream& operator<<(ostream& out, vtkEdgeBase e); +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGraphEdge.cxx b/Common/DataModel/vtkGraphEdge.cxx index 39a086532f..f5773c1f72 100644 --- a/Common/DataModel/vtkGraphEdge.cxx +++ b/Common/DataModel/vtkGraphEdge.cxx @@ -22,6 +22,7 @@ #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkGraphEdge); //------------------------------------------------------------------------------ vtkGraphEdge::vtkGraphEdge() @@ -42,3 +43,4 @@ void vtkGraphEdge::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Target: " << this->Target << endl; os << indent << "Id: " << this->Id << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGraphEdge.h b/Common/DataModel/vtkGraphEdge.h index d2e45f9f38..dd8b5abfa6 100644 --- a/Common/DataModel/vtkGraphEdge.h +++ b/Common/DataModel/vtkGraphEdge.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkGraphEdge : public vtkObject { public: @@ -80,4 +81,5 @@ private: void operator=(const vtkGraphEdge&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkGraphInternals.cxx b/Common/DataModel/vtkGraphInternals.cxx index 2f333b0499..2635595bce 100644 --- a/Common/DataModel/vtkGraphInternals.cxx +++ b/Common/DataModel/vtkGraphInternals.cxx @@ -21,6 +21,7 @@ #include "vtkDistributedGraphHelper.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkGraphInternals); //------------------------------------------------------------------------------ @@ -114,3 +115,4 @@ void vtkGraphInternals::ReplaceEdgeFromInList( } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkGraphInternals.h b/Common/DataModel/vtkGraphInternals.h index 48329c7659..a0891768af 100644 --- a/Common/DataModel/vtkGraphInternals.h +++ b/Common/DataModel/vtkGraphInternals.h @@ -39,6 +39,7 @@ // class vtkVertexAdjacencyList //---------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN class vtkVertexAdjacencyList { public: @@ -101,4 +102,5 @@ private: void operator=(const vtkGraphInternals&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkGraphInternals_h diff --git a/Common/DataModel/vtkHexagonalPrism.cxx b/Common/DataModel/vtkHexagonalPrism.cxx index 63811d5f22..690daa9d72 100644 --- a/Common/DataModel/vtkHexagonalPrism.cxx +++ b/Common/DataModel/vtkHexagonalPrism.cxx @@ -32,6 +32,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHexagonalPrism); static const double VTK_DIVERGED = 1.e6; @@ -1117,3 +1118,4 @@ void vtkHexagonalPrism::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Polygon:\n"; this->Polygon->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHexagonalPrism.h b/Common/DataModel/vtkHexagonalPrism.h index f249828db2..c07d57bec9 100644 --- a/Common/DataModel/vtkHexagonalPrism.h +++ b/Common/DataModel/vtkHexagonalPrism.h @@ -38,6 +38,7 @@ #include "vtkCell3D.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkPolygon; class vtkQuad; @@ -207,4 +208,5 @@ inline int vtkHexagonalPrism::GetParametricCenter(double pcoords[3]) pcoords[2] = 0.5; return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHexahedron.cxx b/Common/DataModel/vtkHexahedron.cxx index b46b0c2e91..1959e545e8 100644 --- a/Common/DataModel/vtkHexahedron.cxx +++ b/Common/DataModel/vtkHexahedron.cxx @@ -30,6 +30,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHexahedron); namespace @@ -499,8 +500,10 @@ bool vtkHexahedron::ComputeCentroid( // Marching cubes case table // +VTK_ABI_NAMESPACE_END #include "vtkMarchingCubesTriangleCases.h" +VTK_ABI_NAMESPACE_BEGIN void vtkHexahedron::Contour(double value, vtkDataArray* cellScalars, vtkIncrementalPointLocator* locator, vtkCellArray* verts, vtkCellArray* lines, vtkCellArray* polys, vtkPointData* inPd, vtkPointData* outPd, vtkCellData* inCd, vtkIdType cellId, @@ -1027,3 +1030,4 @@ void vtkHexahedron::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Quad:\n"; this->Quad->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHexahedron.h b/Common/DataModel/vtkHexahedron.h index 2ce3d98f10..7bb0e8a363 100644 --- a/Common/DataModel/vtkHexahedron.h +++ b/Common/DataModel/vtkHexahedron.h @@ -34,6 +34,7 @@ #include "vtkCell3D.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkQuad; class vtkIncrementalPointLocator; @@ -200,4 +201,5 @@ private: void operator=(const vtkHexahedron&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHierarchicalBoxDataIterator.cxx b/Common/DataModel/vtkHierarchicalBoxDataIterator.cxx index 20c17fbd08..d9b43de0e1 100644 --- a/Common/DataModel/vtkHierarchicalBoxDataIterator.cxx +++ b/Common/DataModel/vtkHierarchicalBoxDataIterator.cxx @@ -18,6 +18,7 @@ #include "vtkHierarchicalBoxDataIterator.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHierarchicalBoxDataIterator); vtkHierarchicalBoxDataIterator::vtkHierarchicalBoxDataIterator() = default; @@ -30,3 +31,4 @@ void vtkHierarchicalBoxDataIterator::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHierarchicalBoxDataIterator.h b/Common/DataModel/vtkHierarchicalBoxDataIterator.h index a5bf7b95a2..2bd171b913 100644 --- a/Common/DataModel/vtkHierarchicalBoxDataIterator.h +++ b/Common/DataModel/vtkHierarchicalBoxDataIterator.h @@ -27,6 +27,7 @@ #include "vtkDeprecation.h" // For VTK_DEPRECATED_IN_9_2_0 #include "vtkUniformGridAMRDataIterator.h" +VTK_ABI_NAMESPACE_BEGIN class VTK_DEPRECATED_IN_9_2_0( "Use vtkUniformGridAMRDataIterator instead of vtkHierarchicalBoxDataIterator") VTKCOMMONDATAMODEL_EXPORT vtkHierarchicalBoxDataIterator : public vtkUniformGridAMRDataIterator @@ -45,6 +46,7 @@ private: void operator=(const vtkHierarchicalBoxDataIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkHierarchicalBoxDataIterator.h diff --git a/Common/DataModel/vtkHierarchicalBoxDataSet.cxx b/Common/DataModel/vtkHierarchicalBoxDataSet.cxx index f9a43c8d7a..c6ed6a70c3 100644 --- a/Common/DataModel/vtkHierarchicalBoxDataSet.cxx +++ b/Common/DataModel/vtkHierarchicalBoxDataSet.cxx @@ -17,6 +17,7 @@ #include "vtkObjectFactory.h" #include "vtkUniformGridAMRDataIterator.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHierarchicalBoxDataSet); //------------------------------------------------------------------------------ @@ -50,3 +51,4 @@ vtkHierarchicalBoxDataSet* vtkHierarchicalBoxDataSet::GetData(vtkInformationVect { return vtkHierarchicalBoxDataSet::GetData(v->GetInformationObject(i)); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHierarchicalBoxDataSet.h b/Common/DataModel/vtkHierarchicalBoxDataSet.h index 9bdc7a9728..0cf7656bee 100644 --- a/Common/DataModel/vtkHierarchicalBoxDataSet.h +++ b/Common/DataModel/vtkHierarchicalBoxDataSet.h @@ -28,6 +28,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkOverlappingAMR.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformation; class vtkInformationVector; @@ -65,4 +66,5 @@ private: void operator=(const vtkHierarchicalBoxDataSet&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHigherOrderCurve.cxx b/Common/DataModel/vtkHigherOrderCurve.cxx index 5003a79706..9efc285550 100644 --- a/Common/DataModel/vtkHigherOrderCurve.cxx +++ b/Common/DataModel/vtkHigherOrderCurve.cxx @@ -27,6 +27,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkHigherOrderCurve::vtkHigherOrderCurve() { this->Approx = nullptr; @@ -416,3 +417,4 @@ bool vtkHigherOrderCurve::TransformApproxToCellParams(int subCell, double* pcoor } return true; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHigherOrderCurve.h b/Common/DataModel/vtkHigherOrderCurve.h index e694cf21a2..c6fca30844 100644 --- a/Common/DataModel/vtkHigherOrderCurve.h +++ b/Common/DataModel/vtkHigherOrderCurve.h @@ -25,6 +25,7 @@ #include "vtkNonLinearCell.h" #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkIdList; @@ -114,4 +115,5 @@ inline int vtkHigherOrderCurve::GetParametricCenter(double center[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif // vtkHigherOrderCurve_h diff --git a/Common/DataModel/vtkHigherOrderHexahedron.cxx b/Common/DataModel/vtkHigherOrderHexahedron.cxx index 2b349c7d57..4ac2bd0a05 100644 --- a/Common/DataModel/vtkHigherOrderHexahedron.cxx +++ b/Common/DataModel/vtkHigherOrderHexahedron.cxx @@ -31,6 +31,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkHigherOrderHexahedron::vtkHigherOrderHexahedron() { this->Approx = nullptr; @@ -783,3 +784,4 @@ const int* vtkHigherOrderHexahedron::GetOrder() } return this->Order; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHigherOrderHexahedron.h b/Common/DataModel/vtkHigherOrderHexahedron.h index aa4587603f..62ab7a4a75 100644 --- a/Common/DataModel/vtkHigherOrderHexahedron.h +++ b/Common/DataModel/vtkHigherOrderHexahedron.h @@ -33,6 +33,7 @@ #include "vtkSmartPointer.h" // For member variable. #include //For std::function +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkHexahedron; @@ -142,4 +143,5 @@ inline int vtkHigherOrderHexahedron::GetParametricCenter(double center[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif // vtkHigherOrderHexahedron_h diff --git a/Common/DataModel/vtkHigherOrderInterpolation.cxx b/Common/DataModel/vtkHigherOrderInterpolation.cxx index 717ce5806d..15af9ab110 100644 --- a/Common/DataModel/vtkHigherOrderInterpolation.cxx +++ b/Common/DataModel/vtkHigherOrderInterpolation.cxx @@ -30,6 +30,7 @@ // vtkStandardNewMacro(vtkHigherOrderInterpolation); //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN static constexpr double hexCorner[8][3] = { { 0., 0., 0. }, { +1., 0., 0. }, { +1., +1., 0. }, { 0., +1., 0. }, { 0., 0., +1. }, { +1., 0., +1. }, { +1., +1., +1. }, { 0., +1., +1. } }; @@ -1279,3 +1280,4 @@ void vtkHigherOrderInterpolation::PrepareForOrder( this->DerivSpace.resize(maxDeriv); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHigherOrderInterpolation.h b/Common/DataModel/vtkHigherOrderInterpolation.h index f44e9b7588..005cc2aa87 100644 --- a/Common/DataModel/vtkHigherOrderInterpolation.h +++ b/Common/DataModel/vtkHigherOrderInterpolation.h @@ -27,6 +27,7 @@ // Define this to include support for a "complete" (21- vs 18-point) wedge. #define VTK_21_POINT_WEDGE true +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkVector2i; class vtkVector3d; @@ -144,4 +145,5 @@ int vtkHigherOrderInterpolation::NumberOfIntervals(const int order[N]) return ni; } +VTK_ABI_NAMESPACE_END #endif // vtkHigherOrderInterpolation_h diff --git a/Common/DataModel/vtkHigherOrderQuadrilateral.cxx b/Common/DataModel/vtkHigherOrderQuadrilateral.cxx index e729325609..ab35e29586 100644 --- a/Common/DataModel/vtkHigherOrderQuadrilateral.cxx +++ b/Common/DataModel/vtkHigherOrderQuadrilateral.cxx @@ -29,6 +29,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkHigherOrderQuadrilateral::vtkHigherOrderQuadrilateral() { this->Approx = nullptr; @@ -614,3 +615,4 @@ const int* vtkHigherOrderQuadrilateral::GetOrder() } return this->Order; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHigherOrderQuadrilateral.h b/Common/DataModel/vtkHigherOrderQuadrilateral.h index 91c2eb86ba..889bf8f042 100644 --- a/Common/DataModel/vtkHigherOrderQuadrilateral.h +++ b/Common/DataModel/vtkHigherOrderQuadrilateral.h @@ -27,6 +27,7 @@ #include "vtkNonLinearCell.h" #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkIdList; @@ -129,4 +130,5 @@ inline int vtkHigherOrderQuadrilateral::GetParametricCenter(double center[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif // vtkHigherOrderQuadrilateral_h diff --git a/Common/DataModel/vtkHigherOrderTetra.cxx b/Common/DataModel/vtkHigherOrderTetra.cxx index 4472950eb3..6f77b44e67 100644 --- a/Common/DataModel/vtkHigherOrderTetra.cxx +++ b/Common/DataModel/vtkHigherOrderTetra.cxx @@ -29,6 +29,7 @@ #define ENABLE_CACHING #define FIFTEEN_POINT_TETRA +VTK_ABI_NAMESPACE_BEGIN namespace { // The linearized tetra is comprised of four linearized faces. Each face is @@ -1080,3 +1081,4 @@ void vtkHigherOrderTetra::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHigherOrderTetra.h b/Common/DataModel/vtkHigherOrderTetra.h index 91f5488b00..c9d28297cb 100644 --- a/Common/DataModel/vtkHigherOrderTetra.h +++ b/Common/DataModel/vtkHigherOrderTetra.h @@ -40,6 +40,7 @@ #include //For caching +VTK_ABI_NAMESPACE_BEGIN class vtkTetra; class vtkHigherOrderCurve; class vtkHigherOrderTriangle; @@ -134,4 +135,5 @@ private: void operator=(const vtkHigherOrderTetra&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHigherOrderTriangle.cxx b/Common/DataModel/vtkHigherOrderTriangle.cxx index b4ab72c509..68e6e061af 100644 --- a/Common/DataModel/vtkHigherOrderTriangle.cxx +++ b/Common/DataModel/vtkHigherOrderTriangle.cxx @@ -30,6 +30,7 @@ #define ENABLE_CACHING #define SEVEN_POINT_TRIANGLE +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkHigherOrderTriangle::vtkHigherOrderTriangle() { @@ -907,3 +908,4 @@ void vtkHigherOrderTriangle::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHigherOrderTriangle.h b/Common/DataModel/vtkHigherOrderTriangle.h index e35dfc4851..89e93f392c 100644 --- a/Common/DataModel/vtkHigherOrderTriangle.h +++ b/Common/DataModel/vtkHigherOrderTriangle.h @@ -40,6 +40,7 @@ #include // For caching +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkHigherOrderCurve; class vtkTriangle; @@ -128,4 +129,5 @@ private: void operator=(const vtkHigherOrderTriangle&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHigherOrderWedge.cxx b/Common/DataModel/vtkHigherOrderWedge.cxx index c688e44528..85be533090 100644 --- a/Common/DataModel/vtkHigherOrderWedge.cxx +++ b/Common/DataModel/vtkHigherOrderWedge.cxx @@ -34,6 +34,7 @@ // VTK_21_POINT_WEDGE is defined (or not) in vtkHigherOrderInterpolation.h #ifdef VTK_21_POINT_WEDGE +VTK_ABI_NAMESPACE_BEGIN static double vtkHigherOrderWedge21ParametricCoords[21 * 3] = { 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.5, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.0, 0.5, 0.0, 1.0, 0.5, 0.5, 1.0, 0.0, 0.5, 1.0, 0.0, 0.0, 0.5, 1.0, 0.0, 0.5, 0.0, 1.0, 0.5, @@ -68,6 +69,7 @@ static constexpr vtkIdType vtkHigherOrderWedge21QuadFace[3][9] = { }; static constexpr vtkIdType vtkHigherOrderWedge21Edge[9][3] = { { 0, 1, 6 }, { 1, 2, 7 }, { 2, 0, 8 }, { 3, 4, 9 }, { 4, 5, 10 }, { 5, 3, 11 }, { 0, 3, 12 }, { 1, 4, 13 }, { 2, 5, 14 } }; +VTK_ABI_NAMESPACE_END #endif // Return the offset into the array of face-DOFs of triangle barycentric integer coordinates (i,j) @@ -103,6 +105,7 @@ static constexpr vtkIdType vtkHigherOrderWedge21Edge[9][3] = { { 0, 1, 6 }, { 1, // return offset = 2 since the face-DOF for this triangle // are ordered { +, @, o }. // +VTK_ABI_NAMESPACE_BEGIN static int triangleDOFOffset(int order, int i, int j) { int off = i + order * (j - 1) - (j * (j + 1)) / 2; @@ -1277,3 +1280,4 @@ const int* vtkHigherOrderWedge::GetOrder() } return this->Order; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHigherOrderWedge.h b/Common/DataModel/vtkHigherOrderWedge.h index 9f0f3b17cb..df690d4a7f 100644 --- a/Common/DataModel/vtkHigherOrderWedge.h +++ b/Common/DataModel/vtkHigherOrderWedge.h @@ -42,6 +42,7 @@ #include "vtkNonLinearCell.h" #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkWedge; @@ -161,4 +162,5 @@ inline int vtkHigherOrderWedge::GetParametricCenter(double center[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif // vtkHigherOrderWedge_h diff --git a/Common/DataModel/vtkHyperTree.cxx b/Common/DataModel/vtkHyperTree.cxx index 0527362681..db8df26ebe 100644 --- a/Common/DataModel/vtkHyperTree.cxx +++ b/Common/DataModel/vtkHyperTree.cxx @@ -30,6 +30,7 @@ PURPOSE. See the above copyright notice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkHyperTree::vtkHyperTree() { this->InitializeBase(2, 3, 8); @@ -611,3 +612,4 @@ vtkHyperTree* vtkHyperTree::CreateInstance(unsigned char factor, unsigned char d ht->Initialize(factor, dimension, pow(factor, dimension)); return ht; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTree.h b/Common/DataModel/vtkHyperTree.h index eb2ec47813..18a893d250 100644 --- a/Common/DataModel/vtkHyperTree.h +++ b/Common/DataModel/vtkHyperTree.h @@ -141,6 +141,7 @@ #include // Used internally #include // std::shared_ptr +VTK_ABI_NAMESPACE_BEGIN class vtkBitArray; class vtkIdList; class vtkHyperTreeGridScales; @@ -554,4 +555,5 @@ private: void operator=(const vtkHyperTree&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeCursor.cxx b/Common/DataModel/vtkHyperTreeCursor.cxx index 715eb88134..a9624aa3ee 100644 --- a/Common/DataModel/vtkHyperTreeCursor.cxx +++ b/Common/DataModel/vtkHyperTreeCursor.cxx @@ -15,6 +15,7 @@ #include "vtkHyperTreeCursor.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkHyperTreeCursor::vtkHyperTreeCursor() = default; //------------------------------------------------------------------------------ @@ -25,3 +26,4 @@ void vtkHyperTreeCursor::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeCursor.h b/Common/DataModel/vtkHyperTreeCursor.h index 4bcf8e85d1..b161b02a1c 100644 --- a/Common/DataModel/vtkHyperTreeCursor.h +++ b/Common/DataModel/vtkHyperTreeCursor.h @@ -38,6 +38,7 @@ #include "vtkDeprecation.h" // For VTK_DEPRECATED_IN_9_2_0 #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class VTK_DEPRECATED_IN_9_2_0( @@ -155,5 +156,6 @@ private: vtkHyperTreeCursor(const vtkHyperTreeCursor&) = delete; void operator=(const vtkHyperTreeCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkHyperTreeCursor.h diff --git a/Common/DataModel/vtkHyperTreeGrid.cxx b/Common/DataModel/vtkHyperTreeGrid.cxx index 365553a124..df9a9721ff 100644 --- a/Common/DataModel/vtkHyperTreeGrid.cxx +++ b/Common/DataModel/vtkHyperTreeGrid.cxx @@ -51,6 +51,7 @@ PURPOSE. See the above copyright notice for more information. #include #include +VTK_ABI_NAMESPACE_BEGIN vtkInformationKeyMacro(vtkHyperTreeGrid, LEVELS, Integer); vtkInformationKeyMacro(vtkHyperTreeGrid, DIMENSION, Integer); vtkInformationKeyMacro(vtkHyperTreeGrid, ORIENTATION, Integer); @@ -1737,3 +1738,4 @@ bool vtkHyperTreeGrid::HasAnyGhostCells() const { return this->CellData->GetArray(vtkDataSetAttributes::GhostArrayName()) != nullptr; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGrid.h b/Common/DataModel/vtkHyperTreeGrid.h index b77d2a86cb..a8f5ff7e54 100644 --- a/Common/DataModel/vtkHyperTreeGrid.h +++ b/Common/DataModel/vtkHyperTreeGrid.h @@ -70,6 +70,7 @@ #include // std::map #include // std::shared_ptr +VTK_ABI_NAMESPACE_BEGIN class vtkBitArray; class vtkBoundingBox; class vtkCellLinks; @@ -834,4 +835,5 @@ private: void operator=(const vtkHyperTreeGrid&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridEntry.cxx b/Common/DataModel/vtkHyperTreeGridEntry.cxx index bf5a13a768..3a8692cbc9 100644 --- a/Common/DataModel/vtkHyperTreeGridEntry.cxx +++ b/Common/DataModel/vtkHyperTreeGridEntry.cxx @@ -22,6 +22,7 @@ PURPOSE. See the above copyright notice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkHyperTreeGridEntry::PrintSelf(ostream& os, vtkIndent indent) { os << indent << "--vtkHyperTreeGridEntry--" << endl; @@ -139,3 +140,4 @@ void vtkHyperTreeGridEntry::ToChild( assert("pre: is_masked" && !IsMasked(grid, tree)); this->Index = tree->GetElderChildIndex(this->Index) + ichild; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridEntry.h b/Common/DataModel/vtkHyperTreeGridEntry.h index 5ccd303e6f..ecced92c69 100644 --- a/Common/DataModel/vtkHyperTreeGridEntry.h +++ b/Common/DataModel/vtkHyperTreeGridEntry.h @@ -66,6 +66,7 @@ #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; @@ -193,5 +194,6 @@ protected: vtkIdType Index; }; +VTK_ABI_NAMESPACE_END #endif // vtkHyperTreeGridEntry_h // VTK-HeaderTest-Exclude: vtkHyperTreeGridEntry.h diff --git a/Common/DataModel/vtkHyperTreeGridGeometricLocator.cxx b/Common/DataModel/vtkHyperTreeGridGeometricLocator.cxx index f1cd119bd6..621a58f5e4 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometricLocator.cxx +++ b/Common/DataModel/vtkHyperTreeGridGeometricLocator.cxx @@ -31,6 +31,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkStandardNewMacro(vtkHyperTreeGridGeometricLocator); @@ -695,3 +696,4 @@ std::vector vtkHyperTreeGridGeometricLocator::GetSortingMap( std::sort(map.begin(), map.end(), [&other](int i0, int i1) { return (other[i0] < other[i1]); }); return map; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridGeometricLocator.h b/Common/DataModel/vtkHyperTreeGridGeometricLocator.h index 5d0731e849..c16233499f 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometricLocator.h +++ b/Common/DataModel/vtkHyperTreeGridGeometricLocator.h @@ -38,6 +38,7 @@ #include "vtkCommonDataModelModule.h" //For export macro #include "vtkHyperTreeGridLocator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericCell; class vtkPoints; class vtkIdList; @@ -191,4 +192,6 @@ private: }; // vtkHyperTreeGridGeometricLocator +VTK_ABI_NAMESPACE_END + #endif // vtkHyperTreeGridGeometricLocator_h diff --git a/Common/DataModel/vtkHyperTreeGridGeometryEntry.cxx b/Common/DataModel/vtkHyperTreeGridGeometryEntry.cxx index ef941341b8..80910fabeb 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometryEntry.cxx +++ b/Common/DataModel/vtkHyperTreeGridGeometryEntry.cxx @@ -22,6 +22,7 @@ PURPOSE. See the above copyright notice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkHyperTreeGridGeometryEntry::vtkHyperTreeGridGeometryEntry() { this->Index = 0; @@ -214,3 +215,4 @@ void vtkHyperTreeGridGeometryEntry::ToChild(const vtkHyperTreeGrid* grid, const } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridGeometryEntry.h b/Common/DataModel/vtkHyperTreeGridGeometryEntry.h index 4294041731..11ad487e45 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometryEntry.h +++ b/Common/DataModel/vtkHyperTreeGridGeometryEntry.h @@ -40,6 +40,7 @@ JB #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; @@ -225,5 +226,6 @@ private: double Origin[3]; }; +VTK_ABI_NAMESPACE_END #endif // vtkHyperTreeGridGeometryEntry_h // VTK-HeaderTest-Exclude: vtkHyperTreeGridGeometryEntry.h diff --git a/Common/DataModel/vtkHyperTreeGridGeometryLevelEntry.cxx b/Common/DataModel/vtkHyperTreeGridGeometryLevelEntry.cxx index 4bc1df0885..f912149a12 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometryLevelEntry.cxx +++ b/Common/DataModel/vtkHyperTreeGridGeometryLevelEntry.cxx @@ -24,6 +24,7 @@ PURPOSE. See the above copyright notice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkHyperTreeGridGeometryLevelEntry::PrintSelf(ostream& os, vtkIndent indent) { os << indent << "--vtkHyperTreeGridGeometryLevelEntry--" << endl; @@ -238,3 +239,4 @@ void vtkHyperTreeGridGeometryLevelEntry::GetPoint(double point[3]) const point[1] = this->Origin[1] + sizeChild[1] / 2.; point[2] = this->Origin[2] + sizeChild[2] / 2.; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridGeometryLevelEntry.h b/Common/DataModel/vtkHyperTreeGridGeometryLevelEntry.h index 6bcba80ba9..2810f9283b 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometryLevelEntry.h +++ b/Common/DataModel/vtkHyperTreeGridGeometryLevelEntry.h @@ -44,6 +44,7 @@ #include "vtkHyperTreeGridNonOrientedGeometryCursor.h" #include "vtkHyperTreeGridOrientedGeometryCursor.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; @@ -264,5 +265,6 @@ private: double Origin[3]; }; +VTK_ABI_NAMESPACE_END #endif // vtkHyperTreeGridGeometryLevelEntry // VTK-HeaderTest-Exclude: vtkHyperTreeGridGeometryLevelEntry.h diff --git a/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedEntry.cxx b/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedEntry.cxx index b37e8a6f1f..ff555ab98e 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedEntry.cxx +++ b/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedEntry.cxx @@ -22,6 +22,7 @@ PURPOSE. See the above copyright notice for more information. #include #include +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkHyperTreeGridGeometryUnlimitedEntry::vtkHyperTreeGridGeometryUnlimitedEntry() { @@ -254,3 +255,4 @@ void vtkHyperTreeGridGeometryUnlimitedEntry::ToChild(const vtkHyperTreeGrid* gri } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedEntry.h b/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedEntry.h index dac9d08b54..629064e55f 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedEntry.h +++ b/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedEntry.h @@ -40,6 +40,7 @@ JB #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; @@ -228,5 +229,6 @@ private: double Origin[3]; }; +VTK_ABI_NAMESPACE_END #endif // vtkHyperTreeGridGeometryUnlimitedEntry_h // VTK-HeaderTest-Exclude: vtkHyperTreeGridGeometryUnlimitedEntry.h diff --git a/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedLevelEntry.cxx b/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedLevelEntry.cxx index 35a292643c..393f7d48aa 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedLevelEntry.cxx +++ b/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedLevelEntry.cxx @@ -24,6 +24,7 @@ PURPOSE. See the above copyright notice for more information. #include #include +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ void vtkHyperTreeGridGeometryUnlimitedLevelEntry::Initialize( vtkHyperTree* tree, unsigned int level, vtkIdType index, const double* origin) @@ -253,3 +254,4 @@ void vtkHyperTreeGridGeometryUnlimitedLevelEntry::GetPoint(double point[3]) cons point[1] = this->Origin[1] + sizeChild[1] / 2.; point[2] = this->Origin[2] + sizeChild[2] / 2.; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedLevelEntry.h b/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedLevelEntry.h index 1226b790d9..5393f72cd7 100644 --- a/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedLevelEntry.h +++ b/Common/DataModel/vtkHyperTreeGridGeometryUnlimitedLevelEntry.h @@ -45,6 +45,7 @@ #include "vtkHyperTreeGridNonOrientedGeometryCursor.h" #include "vtkHyperTreeGridOrientedGeometryCursor.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; @@ -253,5 +254,6 @@ private: double Origin[3]; }; +VTK_ABI_NAMESPACE_END #endif // vtkHyperTreeGridGeometryUnlimitedLevelEntry // VTK-HeaderTest-Exclude: vtkHyperTreeGridGeometryUnlimitedLevelEntry.h diff --git a/Common/DataModel/vtkHyperTreeGridLevelEntry.cxx b/Common/DataModel/vtkHyperTreeGridLevelEntry.cxx index 2ca801e1e1..600b49e6c6 100644 --- a/Common/DataModel/vtkHyperTreeGridLevelEntry.cxx +++ b/Common/DataModel/vtkHyperTreeGridLevelEntry.cxx @@ -23,6 +23,7 @@ PURPOSE. See the above copyright notice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkHyperTreeGridLevelEntry::vtkHyperTreeGridLevelEntry( vtkHyperTreeGrid* grid, vtkIdType treeIndex, bool create) : Tree(grid->GetTree(treeIndex, create)) @@ -169,3 +170,4 @@ void vtkHyperTreeGridLevelEntry::ToChild(const vtkHyperTreeGrid* grid, unsigned this->Index = this->Tree->GetElderChildIndex(this->Index) + ichild; this->Level++; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridLevelEntry.h b/Common/DataModel/vtkHyperTreeGridLevelEntry.h index cd4abe81da..1a189d158f 100644 --- a/Common/DataModel/vtkHyperTreeGridLevelEntry.h +++ b/Common/DataModel/vtkHyperTreeGridLevelEntry.h @@ -39,6 +39,7 @@ #include "vtkObject.h" #include "vtkSmartPointer.h" // Used internally +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; class vtkHyperTreeGridNonOrientedCursor; @@ -237,5 +238,6 @@ protected: vtkIdType Index; }; +VTK_ABI_NAMESPACE_END #endif // vtkHyperTreeGridLevelEntry_h // VTK-HeaderTest-Exclude: vtkHyperTreeGridLevelEntry.h diff --git a/Common/DataModel/vtkHyperTreeGridLocator.cxx b/Common/DataModel/vtkHyperTreeGridLocator.cxx index 73f6ffd2b5..e967b99032 100644 --- a/Common/DataModel/vtkHyperTreeGridLocator.cxx +++ b/Common/DataModel/vtkHyperTreeGridLocator.cxx @@ -17,6 +17,7 @@ #include "vtkHyperTreeGrid.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkHyperTreeGridLocator::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); @@ -57,3 +58,4 @@ void vtkHyperTreeGridLocator::Update() return; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridLocator.h b/Common/DataModel/vtkHyperTreeGridLocator.h index b91c4f7109..528a649825 100644 --- a/Common/DataModel/vtkHyperTreeGridLocator.h +++ b/Common/DataModel/vtkHyperTreeGridLocator.h @@ -39,6 +39,8 @@ #include "vtkObject.h" #include "vtkWeakPointer.h" //For HTG member +VTK_ABI_NAMESPACE_BEGIN + class vtkHyperTreeGrid; class vtkPoints; class vtkIdList; @@ -148,4 +150,5 @@ private: }; // vtkHyperTreeGridLocator +VTK_ABI_NAMESPACE_END #endif // vtkHyperTreeGridLocator_h diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedCursor.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedCursor.cxx index 23ffddb5a2..1fea20a68b 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedCursor.cxx @@ -22,6 +22,7 @@ PURPOSE. See the above copyright notice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridNonOrientedCursor); //------------------------------------------------------------------------------ @@ -235,3 +236,4 @@ vtkHyperTreeGridNonOrientedCursor::vtkHyperTreeGridNonOrientedCursor() vtkHyperTreeGridNonOrientedCursor::~vtkHyperTreeGridNonOrientedCursor() = default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedCursor.h b/Common/DataModel/vtkHyperTreeGridNonOrientedCursor.h index de46ed3e9b..d9e7005a65 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedCursor.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedCursor.h @@ -46,6 +46,7 @@ #include // For std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; class vtkHyperTreeGridEntry; @@ -227,4 +228,5 @@ private: vtkHyperTreeGridNonOrientedCursor(const vtkHyperTreeGridNonOrientedCursor&) = delete; void operator=(const vtkHyperTreeGridNonOrientedCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedGeometryCursor.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedGeometryCursor.cxx index 76b42609c6..840506e894 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedGeometryCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedGeometryCursor.cxx @@ -25,6 +25,7 @@ PURPOSE. See the above copyright Nonice for more information. #include "vtkHyperTreeGridOrientedGeometryCursor.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridNonOrientedGeometryCursor); //------------------------------------------------------------------------------ @@ -317,3 +318,4 @@ vtkHyperTreeGridNonOrientedGeometryCursor::GetHyperTreeGridOrientedGeometryCurso cursor->Initialize(grid, this->Tree, this->GetLevel(), this->GetVertexId(), this->GetOrigin()); return cursor; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedGeometryCursor.h b/Common/DataModel/vtkHyperTreeGridNonOrientedGeometryCursor.h index d1a050e211..21f3402bf0 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedGeometryCursor.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedGeometryCursor.h @@ -51,6 +51,7 @@ #include // std::shared_ptr #include // std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; class vtkHyperTreeGridScales; @@ -262,4 +263,5 @@ private: const vtkHyperTreeGridNonOrientedGeometryCursor&) = delete; void operator=(const vtkHyperTreeGridNonOrientedGeometryCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursor.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursor.cxx index a8abc05af9..c91f5288b2 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursor.cxx @@ -25,11 +25,14 @@ PURPOSE. See the above copyright Nonice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridNonOrientedMooreSuperCursor); +VTK_ABI_NAMESPACE_END #include "vtkHyperTreeGridNonOrientedMooreSuperCursorData.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkHyperTreeGridNonOrientedMooreSuperCursor::Initialize( vtkHyperTreeGrid* grid, vtkIdType treeIndex, bool create) { @@ -373,3 +376,4 @@ vtkHyperTreeGridNonOrientedMooreSuperCursor::~vtkHyperTreeGridNonOrientedMooreSu default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursor.h b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursor.h index 3b08bb2afb..4c49229093 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursor.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursor.h @@ -43,6 +43,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkHyperTreeGridNonOrientedSuperCursor.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkHyperTree; class vtkHyperTreeGrid; @@ -86,4 +87,5 @@ private: void operator=(const vtkHyperTreeGridNonOrientedMooreSuperCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorData.h b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorData.h index 84bd2ab105..732107dc21 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorData.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorData.h @@ -7,6 +7,7 @@ // Super cursor traversal table to retrieve the child index for each cursor // of the parent node. There are (3*f)^d entries in the table. // d = 1 f = 2 +VTK_ABI_NAMESPACE_BEGIN static const unsigned int MooreChildCursorToChildTable12[6] = { 1, 0, 1, 0, 1, 0, @@ -226,5 +227,7 @@ static const unsigned int* CornerNeighborCursorsTable3D[8] = { }; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END + // clang-format on #endif /* end of include guard: vtkHyperTreeGridNonOrientedMooreSuperCursorData_h */ diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.cxx index 4880933533..4e6a77ddda 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.cxx @@ -26,11 +26,14 @@ PURPOSE. See the above copyright Nonice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridNonOrientedMooreSuperCursorLight); +VTK_ABI_NAMESPACE_END #include "vtkHyperTreeGridNonOrientedMooreSuperCursorData.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkHyperTreeGridNonOrientedMooreSuperCursorLight::Initialize( vtkHyperTreeGrid* grid, vtkIdType treeIndex, bool create) { @@ -373,3 +376,4 @@ vtkHyperTreeGridNonOrientedMooreSuperCursorLight:: ~vtkHyperTreeGridNonOrientedMooreSuperCursorLight() = default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.h b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.h index 71acd1b939..06cdfc7241 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.h @@ -42,6 +42,7 @@ #include "vtkHyperTreeGridNonOrientedSuperCursorLight.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkHyperTree; class vtkHyperTreeGrid; @@ -87,4 +88,5 @@ private: void operator=(const vtkHyperTreeGridNonOrientedMooreSuperCursorLight&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursor.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursor.cxx index ce7bcb202c..487ca62240 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursor.cxx @@ -31,6 +31,7 @@ PURPOSE. See the above copyright Nonice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkHyperTreeGridNonOrientedSuperCursor* vtkHyperTreeGridNonOrientedSuperCursor::Clone() { vtkHyperTreeGridNonOrientedSuperCursor* clone = this->NewInstance(); @@ -553,3 +554,4 @@ unsigned int vtkHyperTreeGridNonOrientedSuperCursor::GetIndicePreviousEntry(unsi return this->ReferenceEntries[refId]; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursor.h b/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursor.h index f61370b61a..dbb460eba9 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursor.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursor.h @@ -50,6 +50,7 @@ #include // For std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; class vtkHyperTreeGridNonOrientedGeometryCursor; @@ -310,4 +311,5 @@ private: void operator=(const vtkHyperTreeGridNonOrientedSuperCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursorLight.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursorLight.cxx index 1fb1798c42..efe4cea6f8 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursorLight.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursorLight.cxx @@ -27,6 +27,7 @@ PURPOSE. See the above copyright Nonice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkHyperTreeGridNonOrientedSuperCursorLight* vtkHyperTreeGridNonOrientedSuperCursorLight::Clone() { vtkHyperTreeGridNonOrientedSuperCursorLight* clone = this->NewInstance(); @@ -462,3 +463,4 @@ vtkHyperTreeGridNonOrientedSuperCursorLight::~vtkHyperTreeGridNonOrientedSuperCu default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursorLight.h b/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursorLight.h index 26c657ed00..c3ea989dd8 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursorLight.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedSuperCursorLight.h @@ -47,6 +47,7 @@ #include // Used internally #include // std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; class vtkHyperTreeGridNonOrientedGeometryCursor; @@ -347,4 +348,5 @@ private: void operator=(const vtkHyperTreeGridNonOrientedSuperCursorLight&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor.cxx index f65b9de9c9..5ff3193262 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor.cxx @@ -26,6 +26,7 @@ PURPOSE. See the above copyright Nonice for more information. #include "vtkHyperTreeGridNonOrientedGeometryCursor.h" #include "vtkHyperTreeGridOrientedGeometryCursor.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor); //------------------------------------------------------------------------------ @@ -334,3 +335,4 @@ vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor::GetHyperTreeGridNonOrientedG cursor->Initialize(grid, this->Tree, this->GetLevel(), this->GetVertexId(), this->GetOrigin()); return cursor; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor.h b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor.h index 6f2b268789..1c15a60876 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor.h @@ -51,6 +51,7 @@ #include // std::shared_ptr #include // std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; class vtkHyperTreeGridScales; @@ -273,4 +274,5 @@ private: const vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor&) = delete; void operator=(const vtkHyperTreeGridNonOrientedUnlimitedGeometryCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor.cxx index 9fc0021a33..f1ae08fa0d 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor.cxx @@ -27,6 +27,7 @@ PURPOSE. See the above copyright Nonice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor); //------------------------------------------------------------------------------ @@ -372,3 +373,4 @@ vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor:: ~vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor() = default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor.h b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor.h index 2150310132..18660cb3f1 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor.h @@ -31,6 +31,7 @@ #include "vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkHyperTree; class vtkHyperTreeGrid; @@ -75,4 +76,5 @@ private: void operator=(const vtkHyperTreeGridNonOrientedUnlimitedMooreSuperCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.cxx index 5d0e14944e..6e7328ff2b 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.cxx @@ -31,6 +31,7 @@ PURPOSE. See the above copyright Nonice for more information. #include #include +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkHyperTreeGridNonOrientedUnlimitedSuperCursor* vtkHyperTreeGridNonOrientedUnlimitedSuperCursor::Clone() @@ -547,3 +548,4 @@ unsigned int vtkHyperTreeGridNonOrientedUnlimitedSuperCursor::GetIndicePreviousE return this->ReferenceEntries[refId]; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.h b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.h index c4e49c7787..41c26760df 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedUnlimitedSuperCursor.h @@ -31,6 +31,7 @@ #include // For std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; class vtkHyperTreeGridNonOrientedGeometryCursor; @@ -288,4 +289,5 @@ private: void operator=(const vtkHyperTreeGridNonOrientedUnlimitedSuperCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursor.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursor.cxx index d680c846a4..42a635a086 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursor.cxx @@ -23,11 +23,14 @@ PURPOSE. See the above copyright Nonice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridNonOrientedVonNeumannSuperCursor); +VTK_ABI_NAMESPACE_END #include "vtkHyperTreeGridNonOrientedVonNeumannSuperCursorData.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkHyperTreeGridNonOrientedVonNeumannSuperCursor::Initialize( vtkHyperTreeGrid* grid, vtkIdType treeIndex, bool create) { @@ -312,3 +315,4 @@ vtkHyperTreeGridNonOrientedVonNeumannSuperCursor:: ~vtkHyperTreeGridNonOrientedVonNeumannSuperCursor() = default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursor.h b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursor.h index 211efeaf3c..2da2c63e80 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursor.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursor.h @@ -43,6 +43,7 @@ #include "vtkHyperTreeGridNonOrientedSuperCursor.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTreeGrid; class VTKCOMMONDATAMODEL_EXPORT vtkHyperTreeGridNonOrientedVonNeumannSuperCursor @@ -77,4 +78,5 @@ private: void operator=(const vtkHyperTreeGridNonOrientedVonNeumannSuperCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorData.h b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorData.h index 6420127262..7a2ec358a3 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorData.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorData.h @@ -7,6 +7,7 @@ // Super cursor traversal table to retrieve the child index for each cursor // of the parent node. There are (2*d+1)*f^d entries in the table. // d = 1 f = 2 +VTK_ABI_NAMESPACE_BEGIN static const unsigned int VonNeumannChildCursorToParentCursorTable12[6] = { 0, 1, 1, 1, 1, 2, @@ -168,6 +169,7 @@ static const unsigned int* VonNeumannChildCursorToChildTable[3][2] = { VonNeumannChildCursorToChildTable33} }; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END // clang-format off #endif /* end of include guard: vtkHyperTreeGridNonOrientedVonNeumannSuperCursorData_h */ diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight.cxx b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight.cxx index bb6a8a447d..020ced5336 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight.cxx +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight.cxx @@ -24,12 +24,15 @@ PURPOSE. See the above copyright Nonice for more information. #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight); // NOLINTNEXTLINE(bugprone-suspicious-include) +VTK_ABI_NAMESPACE_END #include "vtkHyperTreeGridNonOrientedVonNeumannSuperCursorData.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN void vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight::Initialize( vtkHyperTreeGrid* grid, vtkIdType treeIndex, bool create) { @@ -314,3 +317,4 @@ vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight:: ~vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight() = default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight.h b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight.h index 060e6fe0b8..1889de4ea0 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight.h @@ -40,6 +40,7 @@ #include "vtkHyperTreeGridNonOrientedSuperCursorLight.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTreeGrid; class VTKCOMMONDATAMODEL_EXPORT vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight @@ -74,4 +75,5 @@ private: void operator=(const vtkHyperTreeGridNonOrientedVonNeumannSuperCursorLight&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridOrientedCursor.cxx b/Common/DataModel/vtkHyperTreeGridOrientedCursor.cxx index bf5900c244..964a74e37b 100644 --- a/Common/DataModel/vtkHyperTreeGridOrientedCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridOrientedCursor.cxx @@ -22,6 +22,7 @@ PURPOSE. See the above copyright notice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridOrientedCursor); //------------------------------------------------------------------------------ @@ -185,3 +186,4 @@ vtkHyperTreeGridOrientedCursor::vtkHyperTreeGridOrientedCursor() vtkHyperTreeGridOrientedCursor::~vtkHyperTreeGridOrientedCursor() = default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridOrientedCursor.h b/Common/DataModel/vtkHyperTreeGridOrientedCursor.h index cdea35ec2e..ee659a07fc 100644 --- a/Common/DataModel/vtkHyperTreeGridOrientedCursor.h +++ b/Common/DataModel/vtkHyperTreeGridOrientedCursor.h @@ -45,6 +45,7 @@ #include "vtkHyperTreeGridEntry.h" // Used internally #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; @@ -204,4 +205,5 @@ private: vtkHyperTreeGridOrientedCursor(const vtkHyperTreeGridOrientedCursor&) = delete; void operator=(const vtkHyperTreeGridOrientedCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridOrientedGeometryCursor.cxx b/Common/DataModel/vtkHyperTreeGridOrientedGeometryCursor.cxx index 59da9ac425..c04394e682 100644 --- a/Common/DataModel/vtkHyperTreeGridOrientedGeometryCursor.cxx +++ b/Common/DataModel/vtkHyperTreeGridOrientedGeometryCursor.cxx @@ -22,6 +22,7 @@ PURPOSE. See the above copyright Nonice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkHyperTreeGridOrientedGeometryCursor); //------------------------------------------------------------------------------ @@ -245,3 +246,4 @@ vtkHyperTreeGridOrientedGeometryCursor::vtkHyperTreeGridOrientedGeometryCursor() vtkHyperTreeGridOrientedGeometryCursor::~vtkHyperTreeGridOrientedGeometryCursor() = default; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkHyperTreeGridOrientedGeometryCursor.h b/Common/DataModel/vtkHyperTreeGridOrientedGeometryCursor.h index 35b8723b09..011e5a6f61 100644 --- a/Common/DataModel/vtkHyperTreeGridOrientedGeometryCursor.h +++ b/Common/DataModel/vtkHyperTreeGridOrientedGeometryCursor.h @@ -47,6 +47,7 @@ #include // For std::shared_ptr #include // For std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTree; class vtkHyperTreeGrid; class vtkHyperTreeGridScales; @@ -227,4 +228,5 @@ private: vtkHyperTreeGridOrientedGeometryCursor(const vtkHyperTreeGridOrientedGeometryCursor&) = delete; void operator=(const vtkHyperTreeGridOrientedGeometryCursor&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkHyperTreeGridScales.h b/Common/DataModel/vtkHyperTreeGridScales.h index 3e81dd29a7..68bd4db871 100644 --- a/Common/DataModel/vtkHyperTreeGridScales.h +++ b/Common/DataModel/vtkHyperTreeGridScales.h @@ -29,9 +29,12 @@ #ifndef vtkHyperTreeGridScales_h #define vtkHyperTreeGridScales_h +#include "vtkABINamespace.h" + #include // For memcpy #include // For std::vector +VTK_ABI_NAMESPACE_BEGIN class vtkHyperTreeGridScales { public: @@ -141,5 +144,6 @@ private: mutable std::vector CellScales; }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkHyperTreeGridScales.h diff --git a/Common/DataModel/vtkHyperTreeGridTools.h b/Common/DataModel/vtkHyperTreeGridTools.h index db57de647e..848b4c52e0 100644 --- a/Common/DataModel/vtkHyperTreeGridTools.h +++ b/Common/DataModel/vtkHyperTreeGridTools.h @@ -16,10 +16,13 @@ #ifndef vtkHyperTreeGridTools_h #define vtkHyperTreeGridTools_h +#include "vtkABINamespace.h" + namespace vtk { namespace hypertreegrid { +VTK_ABI_NAMESPACE_BEGIN template bool HasTree(const T& e) @@ -27,6 +30,7 @@ bool HasTree(const T& e) return e.GetTree() != nullptr; } +VTK_ABI_NAMESPACE_END } // namespace hypertreegrid } // namespace vtk diff --git a/Common/DataModel/vtkImageData.cxx b/Common/DataModel/vtkImageData.cxx index de0670b993..0fe4f5f3b2 100644 --- a/Common/DataModel/vtkImageData.cxx +++ b/Common/DataModel/vtkImageData.cxx @@ -34,6 +34,7 @@ #include "vtkVertex.h" #include "vtkVoxel.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImageData); vtkStandardExtendedNewMacro(vtkImageData); @@ -2630,3 +2631,4 @@ bool vtkImageData::HasAnyBlankCells() int cellBlanking = this->CellData->HasAnyGhostBitSet(vtkDataSetAttributes::HIDDENCELL); return cellBlanking || this->HasAnyBlankPoints(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImageData.h b/Common/DataModel/vtkImageData.h index 935ee8ffbd..bcc9415959 100644 --- a/Common/DataModel/vtkImageData.h +++ b/Common/DataModel/vtkImageData.h @@ -36,6 +36,7 @@ #include "vtkStructuredData.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkLine; class vtkMatrix3x3; @@ -701,4 +702,5 @@ inline int vtkImageData::GetDataDimension() return vtkStructuredData::GetDataDimension(this->DataDescription); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImageIterator.cxx b/Common/DataModel/vtkImageIterator.cxx index 8df1cdd86f..f4f57ef901 100644 --- a/Common/DataModel/vtkImageIterator.cxx +++ b/Common/DataModel/vtkImageIterator.cxx @@ -17,4 +17,6 @@ #include "vtkImageIterator.txx" +VTK_ABI_NAMESPACE_BEGIN vtkInstantiateTemplateMacro(template class VTKCOMMONDATAMODEL_EXPORT vtkImageIterator); +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImageIterator.h b/Common/DataModel/vtkImageIterator.h index 1222eeb26e..ea3f5fda3c 100644 --- a/Common/DataModel/vtkImageIterator.h +++ b/Common/DataModel/vtkImageIterator.h @@ -28,6 +28,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN class vtkImageData; template @@ -94,5 +95,6 @@ vtkExternTemplateMacro(extern template class VTKCOMMONDATAMODEL_EXPORT vtkImageI #endif #endif +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkImageIterator.h diff --git a/Common/DataModel/vtkImageIterator.txx b/Common/DataModel/vtkImageIterator.txx index e421725466..27392789cc 100644 --- a/Common/DataModel/vtkImageIterator.txx +++ b/Common/DataModel/vtkImageIterator.txx @@ -19,6 +19,7 @@ #include "vtkImageIterator.h" //---------------------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN template vtkImageIterator::vtkImageIterator() { @@ -70,4 +71,5 @@ void vtkImageIterator::NextSpan() } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImageTransform.cxx b/Common/DataModel/vtkImageTransform.cxx index 641b00321e..8e3a338ac6 100644 --- a/Common/DataModel/vtkImageTransform.cxx +++ b/Common/DataModel/vtkImageTransform.cxx @@ -25,6 +25,7 @@ #include "vtkPointSet.h" #include "vtkSMPTools.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImageTransform); //============================================================================ @@ -341,3 +342,4 @@ void vtkImageTransform::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImageTransform.h b/Common/DataModel/vtkImageTransform.h index d355e8dc04..4e00e4180b 100644 --- a/Common/DataModel/vtkImageTransform.h +++ b/Common/DataModel/vtkImageTransform.h @@ -46,6 +46,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkImageData; class vtkMatrix3x3; @@ -116,4 +117,5 @@ private: void operator=(const vtkImageTransform&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitBoolean.cxx b/Common/DataModel/vtkImplicitBoolean.cxx index e16e723964..0b34e97817 100644 --- a/Common/DataModel/vtkImplicitBoolean.cxx +++ b/Common/DataModel/vtkImplicitBoolean.cxx @@ -19,6 +19,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImplicitBoolean); // Construct with union operation. @@ -258,3 +259,4 @@ void vtkImplicitBoolean::PrintSelf(ostream& os, vtkIndent indent) os << "VTK_DIFFERENCE\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitBoolean.h b/Common/DataModel/vtkImplicitBoolean.h index bc0fb9f88f..5905f847c5 100644 --- a/Common/DataModel/vtkImplicitBoolean.h +++ b/Common/DataModel/vtkImplicitBoolean.h @@ -38,6 +38,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkImplicitFunctionCollection; class VTKCOMMONDATAMODEL_EXPORT vtkImplicitBoolean : public vtkImplicitFunction @@ -141,4 +142,5 @@ inline const char* vtkImplicitBoolean::GetOperationTypeAsString() } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitDataSet.cxx b/Common/DataModel/vtkImplicitDataSet.cxx index a81d6bb8df..654c0bdee5 100644 --- a/Common/DataModel/vtkImplicitDataSet.cxx +++ b/Common/DataModel/vtkImplicitDataSet.cxx @@ -22,6 +22,7 @@ #include "vtkObjectFactory.h" #include "vtkPointData.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImplicitDataSet); vtkCxxSetObjectMacro(vtkImplicitDataSet, DataSet, vtkDataSet); @@ -185,3 +186,4 @@ void vtkImplicitDataSet::ReportReferences(vtkGarbageCollector* collector) // reference loop. vtkGarbageCollectorReport(collector, this->DataSet, "DataSet"); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitDataSet.h b/Common/DataModel/vtkImplicitDataSet.h index 8a7033fd9d..b3c40c2009 100644 --- a/Common/DataModel/vtkImplicitDataSet.h +++ b/Common/DataModel/vtkImplicitDataSet.h @@ -43,6 +43,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class VTKCOMMONDATAMODEL_EXPORT vtkImplicitDataSet : public vtkImplicitFunction @@ -118,4 +119,5 @@ private: void operator=(const vtkImplicitDataSet&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitFunction.cxx b/Common/DataModel/vtkImplicitFunction.cxx index 7430b374c2..f3ee8f76cf 100644 --- a/Common/DataModel/vtkImplicitFunction.cxx +++ b/Common/DataModel/vtkImplicitFunction.cxx @@ -22,6 +22,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkImplicitFunction, Transform, vtkAbstractTransform); vtkImplicitFunction::vtkImplicitFunction() @@ -258,3 +259,4 @@ void vtkImplicitFunction::SetTransform(const double elements[16]) this->SetTransform(transform); transform->Delete(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitFunction.h b/Common/DataModel/vtkImplicitFunction.h index c262cfbdd6..2cbf541909 100644 --- a/Common/DataModel/vtkImplicitFunction.h +++ b/Common/DataModel/vtkImplicitFunction.h @@ -53,6 +53,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkAbstractTransform; @@ -147,4 +148,5 @@ private: void operator=(const vtkImplicitFunction&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitFunctionCollection.cxx b/Common/DataModel/vtkImplicitFunctionCollection.cxx index 246d39c268..13e120ce06 100644 --- a/Common/DataModel/vtkImplicitFunctionCollection.cxx +++ b/Common/DataModel/vtkImplicitFunctionCollection.cxx @@ -15,9 +15,11 @@ #include "vtkImplicitFunctionCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImplicitFunctionCollection); void vtkImplicitFunctionCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitFunctionCollection.h b/Common/DataModel/vtkImplicitFunctionCollection.h index 016fb168ab..91cf495b4f 100644 --- a/Common/DataModel/vtkImplicitFunctionCollection.h +++ b/Common/DataModel/vtkImplicitFunctionCollection.h @@ -30,6 +30,7 @@ #include "vtkImplicitFunction.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkImplicitFunctionCollection : public vtkCollection { public: @@ -81,4 +82,5 @@ inline vtkImplicitFunction* vtkImplicitFunctionCollection::GetNextItem() return static_cast(this->GetNextItemAsObject()); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitHalo.cxx b/Common/DataModel/vtkImplicitHalo.cxx index 76eb9b998d..4cadaf7fc0 100644 --- a/Common/DataModel/vtkImplicitHalo.cxx +++ b/Common/DataModel/vtkImplicitHalo.cxx @@ -18,6 +18,7 @@ #include "vtkObjectFactory.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImplicitHalo); //------------------------------------------------------------------------------ @@ -75,3 +76,4 @@ void vtkImplicitHalo::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Radius: " << this->Radius << endl; os << indent << "FadeOut: " << this->FadeOut << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitHalo.h b/Common/DataModel/vtkImplicitHalo.h index 53001c4e76..0bb5237e5a 100644 --- a/Common/DataModel/vtkImplicitHalo.h +++ b/Common/DataModel/vtkImplicitHalo.h @@ -35,6 +35,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkImplicitHalo : public vtkImplicitFunction { public: @@ -96,4 +97,5 @@ private: void operator=(const vtkImplicitHalo&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitSelectionLoop.cxx b/Common/DataModel/vtkImplicitSelectionLoop.cxx index d839be111a..cfa14aeae5 100644 --- a/Common/DataModel/vtkImplicitSelectionLoop.cxx +++ b/Common/DataModel/vtkImplicitSelectionLoop.cxx @@ -22,6 +22,7 @@ #include "vtkPoints.h" #include "vtkPolygon.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImplicitSelectionLoop); vtkCxxSetObjectMacro(vtkImplicitSelectionLoop, Loop, vtkPoints); @@ -208,3 +209,4 @@ void vtkImplicitSelectionLoop::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Normal: (" << this->Normal[0] << ", " << this->Normal[1] << ", " << this->Normal[2] << ")\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitSelectionLoop.h b/Common/DataModel/vtkImplicitSelectionLoop.h index a9d2c22d0d..1fa2322dd2 100644 --- a/Common/DataModel/vtkImplicitSelectionLoop.h +++ b/Common/DataModel/vtkImplicitSelectionLoop.h @@ -51,6 +51,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkPolygon; @@ -142,4 +143,5 @@ private: void operator=(const vtkImplicitSelectionLoop&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitSum.cxx b/Common/DataModel/vtkImplicitSum.cxx index 5bce3244d2..2b14dfc3e9 100644 --- a/Common/DataModel/vtkImplicitSum.cxx +++ b/Common/DataModel/vtkImplicitSum.cxx @@ -20,6 +20,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImplicitSum); //------------------------------------------------------------------------------ @@ -188,3 +189,4 @@ void vtkImplicitSum::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Weights:\n"; this->Weights->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitSum.h b/Common/DataModel/vtkImplicitSum.h index 28dab2bfd1..ac227dcbe9 100644 --- a/Common/DataModel/vtkImplicitSum.h +++ b/Common/DataModel/vtkImplicitSum.h @@ -29,6 +29,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkImplicitFunctionCollection; @@ -110,4 +111,5 @@ private: void operator=(const vtkImplicitSum&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitVolume.cxx b/Common/DataModel/vtkImplicitVolume.cxx index c75497716a..e92fca6904 100644 --- a/Common/DataModel/vtkImplicitVolume.cxx +++ b/Common/DataModel/vtkImplicitVolume.cxx @@ -21,6 +21,7 @@ #include "vtkPointData.h" #include "vtkVoxel.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImplicitVolume); vtkCxxSetObjectMacro(vtkImplicitVolume, Volume, vtkImageData); @@ -172,3 +173,4 @@ void vtkImplicitVolume::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Volume: (none)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitVolume.h b/Common/DataModel/vtkImplicitVolume.h index 2780151a9f..c37493307d 100644 --- a/Common/DataModel/vtkImplicitVolume.h +++ b/Common/DataModel/vtkImplicitVolume.h @@ -43,6 +43,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkImageData; @@ -118,4 +119,5 @@ private: void operator=(const vtkImplicitVolume&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkImplicitWindowFunction.cxx b/Common/DataModel/vtkImplicitWindowFunction.cxx index 3a931ddb70..38aa08b361 100644 --- a/Common/DataModel/vtkImplicitWindowFunction.cxx +++ b/Common/DataModel/vtkImplicitWindowFunction.cxx @@ -17,6 +17,7 @@ #include "vtkGarbageCollector.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkImplicitWindowFunction); vtkCxxSetObjectMacro(vtkImplicitWindowFunction, ImplicitFunction, vtkImplicitFunction); @@ -139,3 +140,4 @@ void vtkImplicitWindowFunction ::ReportReferences(vtkGarbageCollector* collector // reference loop. vtkGarbageCollectorReport(collector, this->ImplicitFunction, "ImplicitFunction"); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkImplicitWindowFunction.h b/Common/DataModel/vtkImplicitWindowFunction.h index eafd3c270d..7d82dead74 100644 --- a/Common/DataModel/vtkImplicitWindowFunction.h +++ b/Common/DataModel/vtkImplicitWindowFunction.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkImplicitWindowFunction : public vtkImplicitFunction { public: @@ -114,4 +115,5 @@ private: void operator=(const vtkImplicitWindowFunction&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkInEdgeIterator.cxx b/Common/DataModel/vtkInEdgeIterator.cxx index 47e46dbf6e..f28062799e 100644 --- a/Common/DataModel/vtkInEdgeIterator.cxx +++ b/Common/DataModel/vtkInEdgeIterator.cxx @@ -24,6 +24,7 @@ #include "vtkGraphEdge.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkInEdgeIterator, Graph, vtkGraph); vtkStandardNewMacro(vtkInEdgeIterator); //------------------------------------------------------------------------------ @@ -84,3 +85,4 @@ void vtkInEdgeIterator::PrintSelf(ostream& os, vtkIndent indent) } os << indent << "Vertex: " << this->Vertex << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkInEdgeIterator.h b/Common/DataModel/vtkInEdgeIterator.h index 93c816e04e..e5dd5ae72e 100644 --- a/Common/DataModel/vtkInEdgeIterator.h +++ b/Common/DataModel/vtkInEdgeIterator.h @@ -40,6 +40,7 @@ #include "vtkGraph.h" // For edge type definitions +VTK_ABI_NAMESPACE_BEGIN class vtkGraphEdge; class VTKCOMMONDATAMODEL_EXPORT vtkInEdgeIterator : public vtkObject @@ -109,4 +110,5 @@ private: void operator=(const vtkInEdgeIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkIncrementalOctreeNode.cxx b/Common/DataModel/vtkIncrementalOctreeNode.cxx index ffeb69adc6..ae56f33cc4 100644 --- a/Common/DataModel/vtkIncrementalOctreeNode.cxx +++ b/Common/DataModel/vtkIncrementalOctreeNode.cxx @@ -19,6 +19,7 @@ #include "vtkObjectFactory.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkIncrementalOctreeNode); vtkCxxSetObjectMacro(vtkIncrementalOctreeNode, PointIdSet, vtkIdList); @@ -832,3 +833,4 @@ int vtkIncrementalOctreeNode::GetNumberOfLevels() const return 1; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkIncrementalOctreeNode.h b/Common/DataModel/vtkIncrementalOctreeNode.h index 9a54f9ae23..d5b672c2a1 100644 --- a/Common/DataModel/vtkIncrementalOctreeNode.h +++ b/Common/DataModel/vtkIncrementalOctreeNode.h @@ -62,6 +62,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkIdList; @@ -469,4 +470,5 @@ inline int vtkIncrementalOctreeNode::UpdateCounterAndDataBoundsRecursively( ? updated : this->Parent->UpdateCounterAndDataBoundsRecursively(point, nHits, updated, endNode)); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkIncrementalOctreePointLocator.cxx b/Common/DataModel/vtkIncrementalOctreePointLocator.cxx index d4f0bc1bae..1da9f87427 100644 --- a/Common/DataModel/vtkIncrementalOctreePointLocator.cxx +++ b/Common/DataModel/vtkIncrementalOctreePointLocator.cxx @@ -32,6 +32,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkIncrementalOctreePointLocator); //------------------------------------------------------------------------------ @@ -1332,3 +1333,4 @@ int vtkIncrementalOctreePointLocator::GetNumberOfLevels() { return this->Level = this->OctreeRootNode->GetNumberOfLevels(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkIncrementalOctreePointLocator.h b/Common/DataModel/vtkIncrementalOctreePointLocator.h index 69aa3d5a66..d29f8a1d63 100644 --- a/Common/DataModel/vtkIncrementalOctreePointLocator.h +++ b/Common/DataModel/vtkIncrementalOctreePointLocator.h @@ -51,6 +51,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkIncrementalPointLocator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkIdList; class vtkIntArray; @@ -508,4 +509,5 @@ private: vtkIncrementalOctreePointLocator(const vtkIncrementalOctreePointLocator&) = delete; void operator=(const vtkIncrementalOctreePointLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkIncrementalPointLocator.cxx b/Common/DataModel/vtkIncrementalPointLocator.cxx index c2376a5838..af5f833d23 100644 --- a/Common/DataModel/vtkIncrementalPointLocator.cxx +++ b/Common/DataModel/vtkIncrementalPointLocator.cxx @@ -16,6 +16,7 @@ #include "vtkIncrementalPointLocator.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkIncrementalPointLocator::vtkIncrementalPointLocator() = default; vtkIncrementalPointLocator::~vtkIncrementalPointLocator() = default; @@ -24,3 +25,4 @@ void vtkIncrementalPointLocator::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkIncrementalPointLocator.h b/Common/DataModel/vtkIncrementalPointLocator.h index 8b3c8b5b76..11c609f5b4 100644 --- a/Common/DataModel/vtkIncrementalPointLocator.h +++ b/Common/DataModel/vtkIncrementalPointLocator.h @@ -45,6 +45,7 @@ #include "vtkAbstractPointLocator.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkIdList; @@ -138,4 +139,5 @@ private: void operator=(const vtkIncrementalPointLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx index a45692a9b5..54b8de55a0 100644 --- a/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx +++ b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx @@ -21,6 +21,7 @@ #include //============================================================================ +VTK_ABI_NAMESPACE_BEGIN class vtkInformationQuadratureSchemeDefinitionVectorValue : public vtkObjectBase { public: @@ -392,3 +393,4 @@ void vtkInformationQuadratureSchemeDefinitionVectorKey::Print(ostream& os, vtkIn } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h index 21a57dae29..d55b146f6e 100644 --- a/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h +++ b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h @@ -29,6 +29,7 @@ #include "vtkCommonInformationKeyManager.h" // Manage instances of this type. #include "vtkInformationKey.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformationQuadratureSchemeDefinitionVectorValue; class vtkXMLDataElement; class vtkQuadratureSchemeDefinition; @@ -151,4 +152,5 @@ private: void operator=(const vtkInformationQuadratureSchemeDefinitionVectorKey&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkIntersectionCounter.h b/Common/DataModel/vtkIntersectionCounter.h index d9b1fef03d..df6216c5f0 100644 --- a/Common/DataModel/vtkIntersectionCounter.h +++ b/Common/DataModel/vtkIntersectionCounter.h @@ -26,6 +26,7 @@ // class VTKCOMMONDATAMODEL_EXPORT vtkIntersectionCounter +VTK_ABI_NAMESPACE_BEGIN class vtkIntersectionCounter { public: @@ -104,5 +105,6 @@ protected: }; // vtkIntersectionCounter +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkIntersectionCounter.h diff --git a/Common/DataModel/vtkIterativeClosestPointTransform.cxx b/Common/DataModel/vtkIterativeClosestPointTransform.cxx index b21da271c9..32dc8959ae 100644 --- a/Common/DataModel/vtkIterativeClosestPointTransform.cxx +++ b/Common/DataModel/vtkIterativeClosestPointTransform.cxx @@ -22,6 +22,7 @@ #include "vtkPoints.h" #include "vtkTransform.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkIterativeClosestPointTransform); //------------------------------------------------------------------------------ @@ -512,3 +513,4 @@ void vtkIterativeClosestPointTransform::PrintSelf(ostream& os, vtkIndent indent) this->LandmarkTransform->PrintSelf(os, indent.GetNextIndent()); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkIterativeClosestPointTransform.h b/Common/DataModel/vtkIterativeClosestPointTransform.h index d629cf0464..5ea5b47c4f 100644 --- a/Common/DataModel/vtkIterativeClosestPointTransform.h +++ b/Common/DataModel/vtkIterativeClosestPointTransform.h @@ -45,6 +45,7 @@ #define VTK_ICP_MODE_RMS 0 #define VTK_ICP_MODE_AV 1 +VTK_ABI_NAMESPACE_BEGIN class vtkCellLocator; class vtkLandmarkTransform; class vtkDataSet; @@ -224,4 +225,5 @@ private: void operator=(const vtkIterativeClosestPointTransform&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkKdNode.cxx b/Common/DataModel/vtkKdNode.cxx index 784a39055e..188394d36b 100644 --- a/Common/DataModel/vtkKdNode.cxx +++ b/Common/DataModel/vtkKdNode.cxx @@ -26,6 +26,7 @@ #include "vtkPlanesIntersection.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkKdNode); vtkCxxSetObjectMacro(vtkKdNode, Left, vtkKdNode); vtkCxxSetObjectMacro(vtkKdNode, Right, vtkKdNode); @@ -993,3 +994,4 @@ void vtkKdNode::PrintSelf(ostream& os, vtkIndent indent) os << indent << "MaxVal: " << this->MaxVal[0] << " " << this->MaxVal[1] << " " << this->MaxVal[2] << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkKdNode.h b/Common/DataModel/vtkKdNode.h index 26ad1f323b..aeffeb04e0 100644 --- a/Common/DataModel/vtkKdNode.h +++ b/Common/DataModel/vtkKdNode.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCell; class vtkPlanesIntersection; @@ -303,4 +304,5 @@ private: void operator=(const vtkKdNode&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkKdTree.cxx b/Common/DataModel/vtkKdTree.cxx index a9e831c085..5c00e8fc5b 100644 --- a/Common/DataModel/vtkKdTree.cxx +++ b/Common/DataModel/vtkKdTree.cxx @@ -50,6 +50,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN namespace { class TimeLog // Similar to vtkTimerLogScope, but can be disabled at runtime. @@ -4820,3 +4821,4 @@ void vtkKdTree::PrintSelf(ostream& os, vtkIndent indent) } os << indent << "Progress: " << this->Progress << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkKdTree.h b/Common/DataModel/vtkKdTree.h index ac2412e0a2..6180154856 100644 --- a/Common/DataModel/vtkKdTree.h +++ b/Common/DataModel/vtkKdTree.h @@ -59,6 +59,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkLocator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkTimerLog; class vtkIdList; class vtkIdTypeArray; @@ -912,4 +913,5 @@ protected: vtkKdTree(const vtkKdTree&) = delete; void operator=(const vtkKdTree&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkKdTreePointLocator.cxx b/Common/DataModel/vtkKdTreePointLocator.cxx index 45e9e64a21..c95f486856 100644 --- a/Common/DataModel/vtkKdTreePointLocator.cxx +++ b/Common/DataModel/vtkKdTreePointLocator.cxx @@ -18,6 +18,7 @@ #include "vtkObjectFactory.h" #include "vtkPointSet.h" +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkStandardNewMacro(vtkKdTreePointLocator); @@ -139,3 +140,4 @@ void vtkKdTreePointLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "KdTree " << this->KdTree << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkKdTreePointLocator.h b/Common/DataModel/vtkKdTreePointLocator.h index 2f930c5c8e..c1b7fbe359 100644 --- a/Common/DataModel/vtkKdTreePointLocator.h +++ b/Common/DataModel/vtkKdTreePointLocator.h @@ -29,6 +29,7 @@ #include "vtkAbstractPointLocator.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkKdTree; @@ -96,4 +97,5 @@ private: void operator=(const vtkKdTreePointLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkLabelMapLookup.h b/Common/DataModel/vtkLabelMapLookup.h index 35d2c7174f..67d103cd95 100644 --- a/Common/DataModel/vtkLabelMapLookup.h +++ b/Common/DataModel/vtkLabelMapLookup.h @@ -28,9 +28,12 @@ #ifndef vtkLabelMapLookup_h #define vtkLabelMapLookup_h +#include "vtkCommonDataModelModule.h" + #include #include +VTK_ABI_NAMESPACE_BEGIN // Determine whether an image label/object has been specified for output. // This requires looking up an image pixel/scalar value and determining // whether it's part of a segmented object. Since this can be relatively @@ -184,5 +187,6 @@ vtkLabelMapLookup* vtkLabelMapLookup::CreateLabelLookup( } } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkLabelMapLookup.h diff --git a/Common/DataModel/vtkLagrangeCurve.cxx b/Common/DataModel/vtkLagrangeCurve.cxx index 83ce1f9b5b..b3498a6298 100644 --- a/Common/DataModel/vtkLagrangeCurve.cxx +++ b/Common/DataModel/vtkLagrangeCurve.cxx @@ -27,6 +27,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLagrangeCurve); vtkLagrangeCurve::vtkLagrangeCurve() = default; @@ -85,3 +86,4 @@ void vtkLagrangeCurve::InterpolateDerivs(const double pcoords[3], double* derivs { vtkLagrangeInterpolation::Tensor1ShapeDerivatives(this->GetOrder(), pcoords, derivs); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLagrangeCurve.h b/Common/DataModel/vtkLagrangeCurve.h index 8a1c6d74f8..7d415acf66 100644 --- a/Common/DataModel/vtkLagrangeCurve.h +++ b/Common/DataModel/vtkLagrangeCurve.h @@ -25,6 +25,7 @@ #include "vtkNew.h" // For member variable. #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkIdList; @@ -56,4 +57,5 @@ private: void operator=(const vtkLagrangeCurve&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkLagrangeCurve_h diff --git a/Common/DataModel/vtkLagrangeHexahedron.cxx b/Common/DataModel/vtkLagrangeHexahedron.cxx index a07e8c8d24..113c707c21 100644 --- a/Common/DataModel/vtkLagrangeHexahedron.cxx +++ b/Common/DataModel/vtkLagrangeHexahedron.cxx @@ -31,6 +31,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLagrangeHexahedron); vtkLagrangeHexahedron::vtkLagrangeHexahedron() = default; @@ -136,3 +137,4 @@ vtkHigherOrderInterpolation* vtkLagrangeHexahedron::GetInterpolation() { return Interp; }; +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLagrangeHexahedron.h b/Common/DataModel/vtkLagrangeHexahedron.h index 4db5abc8d6..701af640da 100644 --- a/Common/DataModel/vtkLagrangeHexahedron.h +++ b/Common/DataModel/vtkLagrangeHexahedron.h @@ -32,6 +32,7 @@ #include "vtkNew.h" // For member variable. #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkHexahedron; @@ -75,4 +76,5 @@ private: void operator=(const vtkLagrangeHexahedron&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkLagrangeHexahedron_h diff --git a/Common/DataModel/vtkLagrangeInterpolation.cxx b/Common/DataModel/vtkLagrangeInterpolation.cxx index b1ff57c12d..8730596117 100644 --- a/Common/DataModel/vtkLagrangeInterpolation.cxx +++ b/Common/DataModel/vtkLagrangeInterpolation.cxx @@ -27,6 +27,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLagrangeInterpolation); vtkLagrangeInterpolation::vtkLagrangeInterpolation() = default; @@ -185,3 +186,4 @@ void vtkLagrangeInterpolation::WedgeEvaluateDerivative(const int order[3], const this->vtkHigherOrderInterpolation::WedgeEvaluateDerivative(order, pcoords, points, fieldVals, fieldDim, fieldDerivs, *tri, vtkLagrangeInterpolation::EvaluateShapeAndGradient); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLagrangeInterpolation.h b/Common/DataModel/vtkLagrangeInterpolation.h index b4f62ff0ef..7a4fc2e06a 100644 --- a/Common/DataModel/vtkLagrangeInterpolation.h +++ b/Common/DataModel/vtkLagrangeInterpolation.h @@ -27,6 +27,7 @@ // Define this to include support for a "complete" (21- vs 18-point) wedge. #define VTK_21_POINT_WEDGE true +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkVector2i; class vtkVector3d; @@ -74,4 +75,5 @@ private: void operator=(const vtkLagrangeInterpolation&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkLagrangeInterpolation_h diff --git a/Common/DataModel/vtkLagrangeQuadrilateral.cxx b/Common/DataModel/vtkLagrangeQuadrilateral.cxx index 5279299e1c..6e37308693 100644 --- a/Common/DataModel/vtkLagrangeQuadrilateral.cxx +++ b/Common/DataModel/vtkLagrangeQuadrilateral.cxx @@ -28,6 +28,7 @@ #include "vtkVector.h" #include "vtkVectorOperators.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLagrangeQuadrilateral); vtkLagrangeQuadrilateral::vtkLagrangeQuadrilateral() = default; @@ -109,3 +110,4 @@ vtkHigherOrderCurve* vtkLagrangeQuadrilateral::GetEdgeCell() { return EdgeCell; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLagrangeQuadrilateral.h b/Common/DataModel/vtkLagrangeQuadrilateral.h index 53531aae0d..ef04bd4d15 100644 --- a/Common/DataModel/vtkLagrangeQuadrilateral.h +++ b/Common/DataModel/vtkLagrangeQuadrilateral.h @@ -25,6 +25,7 @@ #include "vtkNew.h" // For member variable. #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkIdList; @@ -65,4 +66,5 @@ private: void operator=(const vtkLagrangeQuadrilateral&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkLagrangeQuadrilateral_h diff --git a/Common/DataModel/vtkLagrangeTetra.cxx b/Common/DataModel/vtkLagrangeTetra.cxx index 817880d015..7460299a85 100644 --- a/Common/DataModel/vtkLagrangeTetra.cxx +++ b/Common/DataModel/vtkLagrangeTetra.cxx @@ -24,6 +24,7 @@ #include "vtkPoints.h" #include "vtkTetra.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLagrangeTetra); //------------------------------------------------------------------------------ vtkLagrangeTetra::vtkLagrangeTetra() = default; @@ -306,3 +307,4 @@ vtkHigherOrderTriangle* vtkLagrangeTetra::GetFaceCell() { return FaceCell; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLagrangeTetra.h b/Common/DataModel/vtkLagrangeTetra.h index 011d1a9c59..dcd5638d77 100644 --- a/Common/DataModel/vtkLagrangeTetra.h +++ b/Common/DataModel/vtkLagrangeTetra.h @@ -36,6 +36,7 @@ #include // For caching +VTK_ABI_NAMESPACE_BEGIN class vtkTetra; class vtkLagrangeCurve; class vtkLagrangeTriangle; @@ -68,4 +69,5 @@ private: void operator=(const vtkLagrangeTetra&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkLagrangeTriangle.cxx b/Common/DataModel/vtkLagrangeTriangle.cxx index cb41c1ffb4..5dc2d25dfe 100644 --- a/Common/DataModel/vtkLagrangeTriangle.cxx +++ b/Common/DataModel/vtkLagrangeTriangle.cxx @@ -29,6 +29,7 @@ #define ENABLE_CACHING #define SEVEN_POINT_TRIANGLE +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLagrangeTriangle); //------------------------------------------------------------------------------ vtkLagrangeTriangle::vtkLagrangeTriangle() = default; @@ -210,3 +211,4 @@ vtkHigherOrderCurve* vtkLagrangeTriangle::GetEdgeCell() { return EdgeCell; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLagrangeTriangle.h b/Common/DataModel/vtkLagrangeTriangle.h index a19e110d61..5509ec53c9 100644 --- a/Common/DataModel/vtkLagrangeTriangle.h +++ b/Common/DataModel/vtkLagrangeTriangle.h @@ -36,6 +36,7 @@ #include // For caching +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkLagrangeCurve; class vtkTriangle; @@ -67,4 +68,5 @@ private: void operator=(const vtkLagrangeTriangle&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkLagrangeWedge.cxx b/Common/DataModel/vtkLagrangeWedge.cxx index 5b068d4eaf..6a6dabaac4 100644 --- a/Common/DataModel/vtkLagrangeWedge.cxx +++ b/Common/DataModel/vtkLagrangeWedge.cxx @@ -32,6 +32,7 @@ #include "vtkVectorOperators.h" #include "vtkWedge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLagrangeWedge); vtkLagrangeWedge::vtkLagrangeWedge() = default; @@ -119,3 +120,4 @@ vtkHigherOrderInterpolation* vtkLagrangeWedge::GetInterpolation() { return Interp; }; +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLagrangeWedge.h b/Common/DataModel/vtkLagrangeWedge.h index f15b1b3eea..6e08068e76 100644 --- a/Common/DataModel/vtkLagrangeWedge.h +++ b/Common/DataModel/vtkLagrangeWedge.h @@ -40,6 +40,7 @@ #include "vtkNew.h" // For member variable. #include "vtkSmartPointer.h" // For member variable. +VTK_ABI_NAMESPACE_BEGIN class vtkCellData; class vtkDoubleArray; class vtkWedge; @@ -86,4 +87,5 @@ private: void operator=(const vtkLagrangeWedge&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkLagrangeWedge_h diff --git a/Common/DataModel/vtkLine.cxx b/Common/DataModel/vtkLine.cxx index 97d4855acd..375e332e99 100644 --- a/Common/DataModel/vtkLine.cxx +++ b/Common/DataModel/vtkLine.cxx @@ -24,6 +24,7 @@ #include "vtkPointData.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkLine); //------------------------------------------------------------------------------ @@ -843,3 +844,4 @@ void vtkLine::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLine.h b/Common/DataModel/vtkLine.h index 82500eafc6..ae5b30bfb1 100644 --- a/Common/DataModel/vtkLine.h +++ b/Common/DataModel/vtkLine.h @@ -24,6 +24,8 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro + +VTK_ABI_NAMESPACE_BEGIN class vtkIncrementalPointLocator; class VTKCOMMONDATAMODEL_EXPORT vtkLine : public vtkCell @@ -198,4 +200,5 @@ inline int vtkLine::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkLocator.cxx b/Common/DataModel/vtkLocator.cxx index 339f52a67a..16eaf1c0c6 100644 --- a/Common/DataModel/vtkLocator.cxx +++ b/Common/DataModel/vtkLocator.cxx @@ -17,6 +17,7 @@ #include "vtkDataSet.h" #include "vtkGarbageCollector.h" +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ vtkCxxSetObjectMacro(vtkLocator, DataSet, vtkDataSet); @@ -88,3 +89,4 @@ void vtkLocator::ReportReferences(vtkGarbageCollector* collector) this->Superclass::ReportReferences(collector); vtkGarbageCollectorReport(collector, this->DataSet, "DataSet"); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLocator.h b/Common/DataModel/vtkLocator.h index be6200d1cf..5b2a8f92a5 100644 --- a/Common/DataModel/vtkLocator.h +++ b/Common/DataModel/vtkLocator.h @@ -63,6 +63,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class vtkPolyData; @@ -218,4 +219,5 @@ private: void operator=(const vtkLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkMappedUnstructuredGrid.h b/Common/DataModel/vtkMappedUnstructuredGrid.h index 48e7f4380c..ef3bc81c38 100644 --- a/Common/DataModel/vtkMappedUnstructuredGrid.h +++ b/Common/DataModel/vtkMappedUnstructuredGrid.h @@ -146,6 +146,7 @@ #include "vtkNew.h" // For vtkNew #include "vtkSmartPointer.h" // For vtkSmartPointer +VTK_ABI_NAMESPACE_BEGIN template > class vtkMappedUnstructuredGrid : public vtkUnstructuredGridBase @@ -200,6 +201,7 @@ private: vtkNew TempCell; }; +VTK_ABI_NAMESPACE_END #include "vtkMappedUnstructuredGrid.txx" // We need to fake the superclass for the wrappers, otherwise they will choke on diff --git a/Common/DataModel/vtkMappedUnstructuredGrid.txx b/Common/DataModel/vtkMappedUnstructuredGrid.txx index a627d0a60d..f022473af0 100644 --- a/Common/DataModel/vtkMappedUnstructuredGrid.txx +++ b/Common/DataModel/vtkMappedUnstructuredGrid.txx @@ -19,6 +19,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN template void vtkMappedUnstructuredGrid::PrintSelf( ostream& os, vtkIndent indent) @@ -226,3 +227,4 @@ Implementation* vtkMappedUnstructuredGrid::GetImpl { return this->Impl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h b/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h index d97bd08edd..bb1152d61a 100644 --- a/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h +++ b/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h @@ -30,6 +30,7 @@ #include "vtkCellIterator.h" #include "vtkSmartPointer.h" // For vtkSmartPointer +VTK_ABI_NAMESPACE_BEGIN template class vtkMappedUnstructuredGrid; @@ -68,6 +69,7 @@ private: vtkIdType NumberOfCells; }; +VTK_ABI_NAMESPACE_END #include "vtkMappedUnstructuredGridCellIterator.txx" // template implementations #endif // vtkMappedUnstructuredGridCellIterator_h diff --git a/Common/DataModel/vtkMappedUnstructuredGridCellIterator.txx b/Common/DataModel/vtkMappedUnstructuredGridCellIterator.txx index 62baddfdc4..a134ec43fd 100644 --- a/Common/DataModel/vtkMappedUnstructuredGridCellIterator.txx +++ b/Common/DataModel/vtkMappedUnstructuredGridCellIterator.txx @@ -20,6 +20,7 @@ #include "vtkPoints.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN template vtkMappedUnstructuredGridCellIterator* vtkMappedUnstructuredGridCellIterator::New() @@ -132,3 +133,4 @@ void vtkMappedUnstructuredGridCellIterator::SetMappedUnstructure this->Points->SetDataType(this->GridPoints->GetDataType()); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMarchingCubesPolygonCases.cxx b/Common/DataModel/vtkMarchingCubesPolygonCases.cxx index 12258de9ed..4e23f9128e 100644 --- a/Common/DataModel/vtkMarchingCubesPolygonCases.cxx +++ b/Common/DataModel/vtkMarchingCubesPolygonCases.cxx @@ -285,7 +285,9 @@ static vtkMarchingCubesPolygonCases VTK_MARCHING_CUBES_POLYGONCASES[] = { { { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 } } // 255 0 }; +VTK_ABI_NAMESPACE_BEGIN vtkMarchingCubesPolygonCases* vtkMarchingCubesPolygonCases::GetCases() { return VTK_MARCHING_CUBES_POLYGONCASES; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMarchingCubesPolygonCases.h b/Common/DataModel/vtkMarchingCubesPolygonCases.h index 78a08ac3fd..4e9c6457cd 100644 --- a/Common/DataModel/vtkMarchingCubesPolygonCases.h +++ b/Common/DataModel/vtkMarchingCubesPolygonCases.h @@ -20,12 +20,14 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN struct VTKCOMMONDATAMODEL_EXPORT vtkMarchingCubesPolygonCases { int edges[17]; static vtkMarchingCubesPolygonCases* GetCases(); }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkMarchingCubesPolygonCases.h diff --git a/Common/DataModel/vtkMarchingCubesTriangleCases.cxx b/Common/DataModel/vtkMarchingCubesTriangleCases.cxx index 70b5e18700..1eab07df89 100644 --- a/Common/DataModel/vtkMarchingCubesTriangleCases.cxx +++ b/Common/DataModel/vtkMarchingCubesTriangleCases.cxx @@ -19,6 +19,7 @@ // Edges to intersect. Three at a time form a triangle. Comments at // end of line indicate case number (0->255) and base case number (0->15). // +VTK_ABI_NAMESPACE_BEGIN static vtkMarchingCubesTriangleCases VTK_MARCHING_CUBES_TRICASES[] = { { { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 } }, /* 0 0 */ { { 0, 3, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 } }, /* 1 1 */ @@ -282,3 +283,4 @@ vtkMarchingCubesTriangleCases* vtkMarchingCubesTriangleCases::GetCases() { return VTK_MARCHING_CUBES_TRICASES; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMarchingCubesTriangleCases.h b/Common/DataModel/vtkMarchingCubesTriangleCases.h index 5f067050af..df646ebd6f 100644 --- a/Common/DataModel/vtkMarchingCubesTriangleCases.h +++ b/Common/DataModel/vtkMarchingCubesTriangleCases.h @@ -20,11 +20,13 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN struct VTKCOMMONDATAMODEL_EXPORT vtkMarchingCubesTriangleCases { int edges[16]; static vtkMarchingCubesTriangleCases* GetCases(); }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkMarchingCubesTriangleCases.h diff --git a/Common/DataModel/vtkMarchingSquaresLineCases.cxx b/Common/DataModel/vtkMarchingSquaresLineCases.cxx index a8f63ef547..bfa1aa97a8 100644 --- a/Common/DataModel/vtkMarchingSquaresLineCases.cxx +++ b/Common/DataModel/vtkMarchingSquaresLineCases.cxx @@ -17,6 +17,7 @@ // Note: the following code is placed here to deal with cross-library // symbol export and import on Microsoft compilers. +VTK_ABI_NAMESPACE_BEGIN static vtkMarchingSquaresLineCases VTK_MARCHING_SQUARES_LINECASES[] = { { { -1, -1, -1, -1, -1 } }, { { 0, 3, -1, -1, -1 } }, @@ -40,3 +41,4 @@ vtkMarchingSquaresLineCases* vtkMarchingSquaresLineCases::GetCases() { return VTK_MARCHING_SQUARES_LINECASES; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMarchingSquaresLineCases.h b/Common/DataModel/vtkMarchingSquaresLineCases.h index 5adfa4322d..849dac63cf 100644 --- a/Common/DataModel/vtkMarchingSquaresLineCases.h +++ b/Common/DataModel/vtkMarchingSquaresLineCases.h @@ -20,11 +20,13 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkSystemIncludes.h" +VTK_ABI_NAMESPACE_BEGIN struct VTKCOMMONDATAMODEL_EXPORT vtkMarchingSquaresLineCases { int edges[5]; static vtkMarchingSquaresLineCases* GetCases(); }; +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkMarchingSquaresLineCases.h diff --git a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.cxx b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.cxx index 77e8da4cf9..892d946bff 100644 --- a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.cxx +++ b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.cxx @@ -29,6 +29,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMeanValueCoordinatesInterpolator); // Special class that can iterate over different type of triangle representations @@ -638,3 +639,4 @@ void vtkMeanValueCoordinatesInterpolator::PrintSelf(ostream& os, vtkIndent inden { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h index be41be496f..63e72f860a 100644 --- a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h +++ b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h @@ -45,6 +45,7 @@ PURPOSE. See the above copyright notice for more information. #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkIdList; class vtkCellArray; @@ -107,4 +108,5 @@ private: void operator=(const vtkMeanValueCoordinatesInterpolator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkMergePoints.cxx b/Common/DataModel/vtkMergePoints.cxx index 2af805829e..f15d1fa5fd 100644 --- a/Common/DataModel/vtkMergePoints.cxx +++ b/Common/DataModel/vtkMergePoints.cxx @@ -20,6 +20,7 @@ #include "vtkObjectFactory.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMergePoints); //------------------------------------------------------------------------------ @@ -170,3 +171,4 @@ void vtkMergePoints::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMergePoints.h b/Common/DataModel/vtkMergePoints.h index 5d42b39427..dfbb835d0a 100644 --- a/Common/DataModel/vtkMergePoints.h +++ b/Common/DataModel/vtkMergePoints.h @@ -30,6 +30,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkPointLocator.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkMergePoints : public vtkPointLocator { public: @@ -69,4 +70,5 @@ private: void operator=(const vtkMergePoints&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkMolecule.cxx b/Common/DataModel/vtkMolecule.cxx index 89277d46a4..f3adad64f1 100644 --- a/Common/DataModel/vtkMolecule.cxx +++ b/Common/DataModel/vtkMolecule.cxx @@ -34,6 +34,7 @@ PURPOSE. See the above copyright notice for more information. #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMolecule); //------------------------------------------------------------------------------ @@ -828,3 +829,4 @@ unsigned long vtkMolecule::GetActualMemorySize() } return size; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMolecule.h b/Common/DataModel/vtkMolecule.h index 71e34e0c99..5b5f5c2006 100644 --- a/Common/DataModel/vtkMolecule.h +++ b/Common/DataModel/vtkMolecule.h @@ -78,6 +78,7 @@ #include "vtkVector.h" // Small templated vector convenience class +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractElectronicData; class vtkDataArray; class vtkInformation; @@ -479,4 +480,5 @@ private: void operator=(const vtkMolecule&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkMultiBlockDataSet.cxx b/Common/DataModel/vtkMultiBlockDataSet.cxx index 2a42d71c2d..e04c19ca21 100644 --- a/Common/DataModel/vtkMultiBlockDataSet.cxx +++ b/Common/DataModel/vtkMultiBlockDataSet.cxx @@ -20,6 +20,7 @@ #include "vtkPartitionedDataSetCollection.h" #include "vtkUniformGridAMR.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMultiBlockDataSet); //------------------------------------------------------------------------------ vtkMultiBlockDataSet::vtkMultiBlockDataSet() = default; @@ -101,3 +102,4 @@ void vtkMultiBlockDataSet::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMultiBlockDataSet.h b/Common/DataModel/vtkMultiBlockDataSet.h index ec872b0b67..912289a274 100644 --- a/Common/DataModel/vtkMultiBlockDataSet.h +++ b/Common/DataModel/vtkMultiBlockDataSet.h @@ -42,6 +42,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObjectTree.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkMultiBlockDataSet : public vtkDataObjectTree { public: @@ -144,4 +145,5 @@ private: void operator=(const vtkMultiBlockDataSet&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkMultiPieceDataSet.cxx b/Common/DataModel/vtkMultiPieceDataSet.cxx index 770156ad8e..561b2175ff 100644 --- a/Common/DataModel/vtkMultiPieceDataSet.cxx +++ b/Common/DataModel/vtkMultiPieceDataSet.cxx @@ -18,6 +18,7 @@ #include "vtkInformationVector.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMultiPieceDataSet); //------------------------------------------------------------------------------ vtkMultiPieceDataSet::vtkMultiPieceDataSet() = default; @@ -42,3 +43,4 @@ void vtkMultiPieceDataSet::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMultiPieceDataSet.h b/Common/DataModel/vtkMultiPieceDataSet.h index a549477d6f..8fee42735d 100644 --- a/Common/DataModel/vtkMultiPieceDataSet.h +++ b/Common/DataModel/vtkMultiPieceDataSet.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkPartitionedDataSet.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class VTKCOMMONDATAMODEL_EXPORT vtkMultiPieceDataSet : public vtkPartitionedDataSet { @@ -96,4 +97,5 @@ private: void operator=(const vtkMultiPieceDataSet&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkMutableDirectedGraph.cxx b/Common/DataModel/vtkMutableDirectedGraph.cxx index 532232c5e2..cf7933a869 100644 --- a/Common/DataModel/vtkMutableDirectedGraph.cxx +++ b/Common/DataModel/vtkMutableDirectedGraph.cxx @@ -28,6 +28,7 @@ //------------------------------------------------------------------------------ // class vtkMutableDirectedGraph //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMutableDirectedGraph); //------------------------------------------------------------------------------ vtkMutableDirectedGraph::vtkMutableDirectedGraph() @@ -248,3 +249,4 @@ void vtkMutableDirectedGraph::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMutableDirectedGraph.h b/Common/DataModel/vtkMutableDirectedGraph.h index 9c3ff84955..4b9938c73a 100644 --- a/Common/DataModel/vtkMutableDirectedGraph.h +++ b/Common/DataModel/vtkMutableDirectedGraph.h @@ -38,6 +38,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDirectedGraph.h" +VTK_ABI_NAMESPACE_BEGIN class vtkEdgeListIterator; class vtkGraphEdge; class vtkVariant; @@ -333,4 +334,5 @@ private: void operator=(const vtkMutableDirectedGraph&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkMutableUndirectedGraph.cxx b/Common/DataModel/vtkMutableUndirectedGraph.cxx index 7394dad986..f5ad07812e 100644 --- a/Common/DataModel/vtkMutableUndirectedGraph.cxx +++ b/Common/DataModel/vtkMutableUndirectedGraph.cxx @@ -29,6 +29,7 @@ //------------------------------------------------------------------------------ // class vtkMutableUndirectedGraph //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkMutableUndirectedGraph); //------------------------------------------------------------------------------ vtkMutableUndirectedGraph::vtkMutableUndirectedGraph() @@ -249,3 +250,4 @@ void vtkMutableUndirectedGraph::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkMutableUndirectedGraph.h b/Common/DataModel/vtkMutableUndirectedGraph.h index 874817e8f1..a886b068fc 100644 --- a/Common/DataModel/vtkMutableUndirectedGraph.h +++ b/Common/DataModel/vtkMutableUndirectedGraph.h @@ -37,6 +37,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkUndirectedGraph.h" +VTK_ABI_NAMESPACE_BEGIN class vtkEdgeListIterator; class vtkGraphEdge; @@ -328,4 +329,5 @@ private: void operator=(const vtkMutableUndirectedGraph&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkNonLinearCell.cxx b/Common/DataModel/vtkNonLinearCell.cxx index 0dd735d71e..ba7d99d34f 100644 --- a/Common/DataModel/vtkNonLinearCell.cxx +++ b/Common/DataModel/vtkNonLinearCell.cxx @@ -16,6 +16,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkNonLinearCell::vtkNonLinearCell() = default; //------------------------------------------------------------------------------ @@ -23,3 +24,4 @@ void vtkNonLinearCell::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkNonLinearCell.h b/Common/DataModel/vtkNonLinearCell.h index 4d9fc5171d..56d59e7e8d 100644 --- a/Common/DataModel/vtkNonLinearCell.h +++ b/Common/DataModel/vtkNonLinearCell.h @@ -33,6 +33,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkNonLinearCell : public vtkCell { public: @@ -55,4 +56,5 @@ private: void operator=(const vtkNonLinearCell&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkNonMergingPointLocator.cxx b/Common/DataModel/vtkNonMergingPointLocator.cxx index fd4b757c8b..f5dde6cddb 100644 --- a/Common/DataModel/vtkNonMergingPointLocator.cxx +++ b/Common/DataModel/vtkNonMergingPointLocator.cxx @@ -17,6 +17,7 @@ #include "vtkObjectFactory.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkNonMergingPointLocator); //------------------------------------------------------------------------------ @@ -31,3 +32,4 @@ void vtkNonMergingPointLocator::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkNonMergingPointLocator.h b/Common/DataModel/vtkNonMergingPointLocator.h index 515d3aa5f4..eecc787fa4 100644 --- a/Common/DataModel/vtkNonMergingPointLocator.h +++ b/Common/DataModel/vtkNonMergingPointLocator.h @@ -37,6 +37,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkPointLocator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class VTKCOMMONDATAMODEL_EXPORT vtkNonMergingPointLocator : public vtkPointLocator @@ -72,4 +73,5 @@ private: void operator=(const vtkNonMergingPointLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkNonOverlappingAMR.cxx b/Common/DataModel/vtkNonOverlappingAMR.cxx index d1a0d75fb3..fa4fd96eed 100644 --- a/Common/DataModel/vtkNonOverlappingAMR.cxx +++ b/Common/DataModel/vtkNonOverlappingAMR.cxx @@ -15,6 +15,7 @@ #include "vtkNonOverlappingAMR.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkNonOverlappingAMR); //------------------------------------------------------------------------------ @@ -28,3 +29,4 @@ void vtkNonOverlappingAMR::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkNonOverlappingAMR.h b/Common/DataModel/vtkNonOverlappingAMR.h index f94815be0b..69094371e7 100644 --- a/Common/DataModel/vtkNonOverlappingAMR.h +++ b/Common/DataModel/vtkNonOverlappingAMR.h @@ -27,6 +27,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkUniformGridAMR.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkNonOverlappingAMR : public vtkUniformGridAMR { public: @@ -60,4 +61,5 @@ private: void operator=(const vtkNonOverlappingAMR&) = delete; }; +VTK_ABI_NAMESPACE_END #endif /* vtkNonOverlappingAMR_h */ diff --git a/Common/DataModel/vtkOctreePointLocator.cxx b/Common/DataModel/vtkOctreePointLocator.cxx index 2ad792df83..ed1c787cc8 100644 --- a/Common/DataModel/vtkOctreePointLocator.cxx +++ b/Common/DataModel/vtkOctreePointLocator.cxx @@ -36,6 +36,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkOctreePointLocator); // helper class for ordering the points in @@ -1300,3 +1301,4 @@ void vtkOctreePointLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "MaxWidth: " << this->MaxWidth << endl; os << indent << "CreateCubicOctants: " << this->CreateCubicOctants << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkOctreePointLocator.h b/Common/DataModel/vtkOctreePointLocator.h index 8626711062..1c2e12c1ca 100644 --- a/Common/DataModel/vtkOctreePointLocator.h +++ b/Common/DataModel/vtkOctreePointLocator.h @@ -40,6 +40,7 @@ #include "vtkAbstractPointLocator.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkIdTypeArray; class vtkOctreePointLocatorNode; @@ -282,4 +283,5 @@ protected: vtkOctreePointLocator(const vtkOctreePointLocator&) = delete; void operator=(const vtkOctreePointLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkOctreePointLocatorNode.cxx b/Common/DataModel/vtkOctreePointLocatorNode.cxx index 1000cc1d79..a3c48ab211 100644 --- a/Common/DataModel/vtkOctreePointLocatorNode.cxx +++ b/Common/DataModel/vtkOctreePointLocatorNode.cxx @@ -26,6 +26,7 @@ #include "vtkPlanesIntersection.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkOctreePointLocatorNode); //------------------------------------------------------------------------------ @@ -631,3 +632,4 @@ void vtkOctreePointLocatorNode::PrintSelf(ostream& os, vtkIndent indent) os << indent << "MaxDataBounds: " << this->MaxDataBounds[0] << " " << this->MaxDataBounds[1] << " " << this->MaxDataBounds[2] << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkOctreePointLocatorNode.h b/Common/DataModel/vtkOctreePointLocatorNode.h index 2cf8f0d7d3..ad9ee251bc 100644 --- a/Common/DataModel/vtkOctreePointLocatorNode.h +++ b/Common/DataModel/vtkOctreePointLocatorNode.h @@ -40,6 +40,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCell; class vtkPlanesIntersection; @@ -298,4 +299,5 @@ private: void operator=(const vtkOctreePointLocatorNode&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkOrderedTriangulator.cxx b/Common/DataModel/vtkOrderedTriangulator.cxx index 95c51009ce..8ee659f957 100644 --- a/Common/DataModel/vtkOrderedTriangulator.cxx +++ b/Common/DataModel/vtkOrderedTriangulator.cxx @@ -34,6 +34,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkOrderedTriangulator); #ifdef _WIN32_WCE @@ -49,12 +50,14 @@ inline void __cdecl operator delete(void*, void*) } #endif #else +VTK_ABI_NAMESPACE_END #include #endif // Classes are used to represent points, faces, and tetras------------------- // This data structure consists of points and tetras, with the face used // temporarily as a place holder during triangulation. +VTK_ABI_NAMESPACE_BEGIN struct OTPoint; struct OTFace; struct OTTetra; @@ -1669,3 +1672,4 @@ void vtkOrderedTriangulator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "UseTemplates: " << (this->UseTemplates ? "On\n" : "Off\n"); os << indent << "NumberOfPoints: " << this->NumberOfPoints << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkOrderedTriangulator.h b/Common/DataModel/vtkOrderedTriangulator.h index b03519b6d4..3cc840ff1d 100644 --- a/Common/DataModel/vtkOrderedTriangulator.h +++ b/Common/DataModel/vtkOrderedTriangulator.h @@ -88,6 +88,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkUnstructuredGrid; class vtkCellArray; class vtkHeap; @@ -363,4 +364,5 @@ private: void operator=(const vtkOrderedTriangulator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkOutEdgeIterator.cxx b/Common/DataModel/vtkOutEdgeIterator.cxx index fd8ae1317d..bcf835a297 100644 --- a/Common/DataModel/vtkOutEdgeIterator.cxx +++ b/Common/DataModel/vtkOutEdgeIterator.cxx @@ -24,6 +24,7 @@ #include "vtkGraphEdge.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkCxxSetObjectMacro(vtkOutEdgeIterator, Graph, vtkGraph); vtkStandardNewMacro(vtkOutEdgeIterator); //------------------------------------------------------------------------------ @@ -84,3 +85,4 @@ void vtkOutEdgeIterator::PrintSelf(ostream& os, vtkIndent indent) } os << indent << "Vertex: " << this->Vertex << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkOutEdgeIterator.h b/Common/DataModel/vtkOutEdgeIterator.h index 6768feff11..80f16a0f4e 100644 --- a/Common/DataModel/vtkOutEdgeIterator.h +++ b/Common/DataModel/vtkOutEdgeIterator.h @@ -40,6 +40,7 @@ #include "vtkGraph.h" // For edge type definitions +VTK_ABI_NAMESPACE_BEGIN class vtkGraphEdge; class VTKCOMMONDATAMODEL_EXPORT vtkOutEdgeIterator : public vtkObject @@ -109,4 +110,5 @@ private: void operator=(const vtkOutEdgeIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkOverlappingAMR.cxx b/Common/DataModel/vtkOverlappingAMR.cxx index 4552838ac8..7676819cf0 100644 --- a/Common/DataModel/vtkOverlappingAMR.cxx +++ b/Common/DataModel/vtkOverlappingAMR.cxx @@ -23,6 +23,7 @@ #include "vtkUnsignedCharArray.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkOverlappingAMR); vtkInformationKeyMacro(vtkOverlappingAMR, NUMBER_OF_BLANKED_POINTS, IdType); @@ -246,3 +247,4 @@ bool vtkOverlappingAMR::FindGrid(double q[3], unsigned int& level, unsigned int& { return this->AMRInfo->FindGrid(q, level, gridId); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkOverlappingAMR.h b/Common/DataModel/vtkOverlappingAMR.h index 48708877d1..fdada40827 100644 --- a/Common/DataModel/vtkOverlappingAMR.h +++ b/Common/DataModel/vtkOverlappingAMR.h @@ -31,6 +31,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkUniformGridAMR.h" +VTK_ABI_NAMESPACE_BEGIN class vtkAMRBox; class vtkCompositeDataIterator; class vtkUniformGrid; @@ -194,4 +195,5 @@ private: void operator=(const vtkOverlappingAMR&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPartitionedDataSet.cxx b/Common/DataModel/vtkPartitionedDataSet.cxx index affcbf9181..743d2ebf32 100644 --- a/Common/DataModel/vtkPartitionedDataSet.cxx +++ b/Common/DataModel/vtkPartitionedDataSet.cxx @@ -19,6 +19,7 @@ #include "vtkInformationVector.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPartitionedDataSet); //------------------------------------------------------------------------------ vtkPartitionedDataSet::vtkPartitionedDataSet() = default; @@ -104,3 +105,4 @@ void vtkPartitionedDataSet::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPartitionedDataSet.h b/Common/DataModel/vtkPartitionedDataSet.h index 19a1e8b32e..573111a9a8 100644 --- a/Common/DataModel/vtkPartitionedDataSet.h +++ b/Common/DataModel/vtkPartitionedDataSet.h @@ -42,6 +42,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObjectTree.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class VTKCOMMONDATAMODEL_EXPORT vtkPartitionedDataSet : public vtkDataObjectTree { @@ -139,4 +140,5 @@ private: void operator=(const vtkPartitionedDataSet&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPartitionedDataSetCollection.cxx b/Common/DataModel/vtkPartitionedDataSetCollection.cxx index adda5e235b..ffa94a690a 100644 --- a/Common/DataModel/vtkPartitionedDataSetCollection.cxx +++ b/Common/DataModel/vtkPartitionedDataSetCollection.cxx @@ -27,6 +27,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPartitionedDataSetCollection); vtkCxxSetObjectMacro(vtkPartitionedDataSetCollection, DataAssembly, vtkDataAssembly); //------------------------------------------------------------------------------ @@ -249,3 +250,4 @@ void vtkPartitionedDataSetCollection::PrintSelf(ostream& os, vtkIndent indent) this->Superclass::PrintSelf(os, indent); os << indent << "DataAssembly: " << this->DataAssembly << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPartitionedDataSetCollection.h b/Common/DataModel/vtkPartitionedDataSetCollection.h index 2d76191044..c325a52592 100644 --- a/Common/DataModel/vtkPartitionedDataSetCollection.h +++ b/Common/DataModel/vtkPartitionedDataSetCollection.h @@ -30,6 +30,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObjectTree.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPartitionedDataSet; class vtkDataAssembly; class vtkDataSet; @@ -186,4 +187,5 @@ private: vtkDataAssembly* DataAssembly; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPath.cxx b/Common/DataModel/vtkPath.cxx index a603d7d77e..31397ba43e 100644 --- a/Common/DataModel/vtkPath.cxx +++ b/Common/DataModel/vtkPath.cxx @@ -26,6 +26,7 @@ #include //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPath); //------------------------------------------------------------------------------ @@ -129,3 +130,4 @@ vtkIntArray* vtkPath::GetCodes() { return vtkArrayDownCast(this->PointData->GetScalars()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPath.h b/Common/DataModel/vtkPath.h index 10cc484b5f..cb75ecff27 100644 --- a/Common/DataModel/vtkPath.h +++ b/Common/DataModel/vtkPath.h @@ -27,6 +27,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkPointSet.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIntArray; class VTKCOMMONDATAMODEL_EXPORT vtkPath : public vtkPointSet @@ -134,4 +135,5 @@ private: void operator=(const vtkPath&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPentagonalPrism.cxx b/Common/DataModel/vtkPentagonalPrism.cxx index 60a8980228..370390e520 100644 --- a/Common/DataModel/vtkPentagonalPrism.cxx +++ b/Common/DataModel/vtkPentagonalPrism.cxx @@ -39,6 +39,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPentagonalPrism); static const double VTK_DIVERGED = 1.e6; @@ -1154,3 +1155,4 @@ void vtkPentagonalPrism::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Polygon:\n"; this->Polygon->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPentagonalPrism.h b/Common/DataModel/vtkPentagonalPrism.h index b83230b514..96666a4a49 100644 --- a/Common/DataModel/vtkPentagonalPrism.h +++ b/Common/DataModel/vtkPentagonalPrism.h @@ -45,6 +45,7 @@ #include "vtkCell3D.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkPolygon; class vtkQuad; @@ -217,4 +218,5 @@ inline int vtkPentagonalPrism::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPeriodicDataArray.h b/Common/DataModel/vtkPeriodicDataArray.h index c81a7422d6..d85c813fef 100644 --- a/Common/DataModel/vtkPeriodicDataArray.h +++ b/Common/DataModel/vtkPeriodicDataArray.h @@ -32,6 +32,7 @@ #include "vtkAOSDataArrayTemplate.h" // Template #include "vtkGenericDataArray.h" // Parent +VTK_ABI_NAMESPACE_BEGIN template class vtkPeriodicDataArray : public vtkGenericDataArray, Scalar> { @@ -383,6 +384,7 @@ private: double PeriodicFiniteRange[6]; // Transformed periodic finite range }; +VTK_ABI_NAMESPACE_END #include "vtkPeriodicDataArray.txx" #endif // vtkPeriodicDataArray_h diff --git a/Common/DataModel/vtkPeriodicDataArray.txx b/Common/DataModel/vtkPeriodicDataArray.txx index d7fcce0494..2914f1d387 100644 --- a/Common/DataModel/vtkPeriodicDataArray.txx +++ b/Common/DataModel/vtkPeriodicDataArray.txx @@ -18,6 +18,7 @@ #include "vtkVariant.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN template void vtkPeriodicDataArray::PrintSelf(ostream& os, vtkIndent indent) { @@ -718,3 +719,4 @@ vtkPeriodicDataArray::~vtkPeriodicDataArray() { this->Initialize(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPerlinNoise.cxx b/Common/DataModel/vtkPerlinNoise.cxx index fa454989e8..6dc7961ba1 100644 --- a/Common/DataModel/vtkPerlinNoise.cxx +++ b/Common/DataModel/vtkPerlinNoise.cxx @@ -17,6 +17,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPerlinNoise); // These functions are from Greg Ward's recursive implementation in @@ -137,3 +138,4 @@ void vtkPerlinNoise::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Phase: (" << this->Phase[0] << ", " << this->Phase[1] << ", " << this->Phase[2] << ")\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPerlinNoise.h b/Common/DataModel/vtkPerlinNoise.h index 1b18d94b32..69020b4c77 100644 --- a/Common/DataModel/vtkPerlinNoise.h +++ b/Common/DataModel/vtkPerlinNoise.h @@ -35,6 +35,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkPerlinNoise : public vtkImplicitFunction { public: @@ -105,4 +106,5 @@ private: void operator=(const vtkPerlinNoise&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx index ae3bf0034d..a5442e8bd7 100644 --- a/Common/DataModel/vtkPiecewiseFunction.cxx +++ b/Common/DataModel/vtkPiecewiseFunction.cxx @@ -26,6 +26,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPiecewiseFunction); // The Node structure @@ -1010,3 +1011,4 @@ void vtkPiecewiseFunction::PrintSelf(ostream& os, vtkIndent indent) os << indent << "AllowDuplicateScalars: " << this->AllowDuplicateScalars << endl; os << indent << "UseLogScale: " << this->UseLogScale << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPiecewiseFunction.h b/Common/DataModel/vtkPiecewiseFunction.h index 7db685e153..71e90d872a 100644 --- a/Common/DataModel/vtkPiecewiseFunction.h +++ b/Common/DataModel/vtkPiecewiseFunction.h @@ -40,6 +40,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPiecewiseFunctionInternals; class VTKCOMMONDATAMODEL_EXPORT vtkPiecewiseFunction : public vtkDataObject @@ -283,4 +284,5 @@ private: void operator=(const vtkPiecewiseFunction&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPixel.cxx b/Common/DataModel/vtkPixel.cxx index af03e3def7..0c0803e734 100644 --- a/Common/DataModel/vtkPixel.cxx +++ b/Common/DataModel/vtkPixel.cxx @@ -31,6 +31,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPixel); //------------------------------------------------------------------------------ @@ -295,8 +296,10 @@ int vtkPixel::CellBoundary(int vtkNotUsed(subId), const double pcoords[3], vtkId // // Marching squares // +VTK_ABI_NAMESPACE_END #include "vtkMarchingSquaresLineCases.h" +VTK_ABI_NAMESPACE_BEGIN static int edges[4][2] = { { 0, 1 }, { 1, 3 }, { 2, 3 }, { 0, 2 } }; void vtkPixel::Contour(double value, vtkDataArray* cellScalars, vtkIncrementalPointLocator* locator, @@ -800,3 +803,4 @@ void vtkPixel::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Line:\n"; this->Line->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPixel.h b/Common/DataModel/vtkPixel.h index b4d1820a8d..d45fdc4ec1 100644 --- a/Common/DataModel/vtkPixel.h +++ b/Common/DataModel/vtkPixel.h @@ -28,6 +28,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkIncrementalPointLocator; @@ -134,4 +135,5 @@ inline int vtkPixel::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPixelExtent.cxx b/Common/DataModel/vtkPixelExtent.cxx index 78e26923c6..c45245e06c 100644 --- a/Common/DataModel/vtkPixelExtent.cxx +++ b/Common/DataModel/vtkPixelExtent.cxx @@ -18,6 +18,7 @@ using std::deque; using std::ostream; //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkPixelExtent vtkPixelExtent::Grow( const vtkPixelExtent& inputExt, const vtkPixelExtent& problemDomain, int n) { @@ -315,3 +316,4 @@ ostream& operator<<(ostream& os, const vtkPixelExtent& ext) } return os; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPixelExtent.h b/Common/DataModel/vtkPixelExtent.h index a65de1e2f2..89ff9d50d5 100644 --- a/Common/DataModel/vtkPixelExtent.h +++ b/Common/DataModel/vtkPixelExtent.h @@ -35,6 +35,7 @@ #include // for inline impl #include // for inline impl +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkPixelExtent { public: @@ -632,5 +633,6 @@ inline bool operator<(const vtkPixelExtent& l, const vtkPixelExtent& r) return l.Size() < r.Size(); } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkPixelExtent.h diff --git a/Common/DataModel/vtkPixelTransfer.cxx b/Common/DataModel/vtkPixelTransfer.cxx index 32b99a73c9..36b3dbcea4 100644 --- a/Common/DataModel/vtkPixelTransfer.cxx +++ b/Common/DataModel/vtkPixelTransfer.cxx @@ -1,6 +1,7 @@ #include "vtkPixelTransfer.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN int vtkPixelTransfer::Blit(const vtkPixelExtent& srcWholeExt, const vtkPixelExtent& srcExt, const vtkPixelExtent& destWholeExt, const vtkPixelExtent& destExt, int nSrcComps, int srcType, void* srcData, int nDestComps, int destType, void* destData) @@ -13,3 +14,4 @@ int vtkPixelTransfer::Blit(const vtkPixelExtent& srcWholeExt, const vtkPixelExte } return 0; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPixelTransfer.h b/Common/DataModel/vtkPixelTransfer.h index 2335c7bd17..169bc690c7 100644 --- a/Common/DataModel/vtkPixelTransfer.h +++ b/Common/DataModel/vtkPixelTransfer.h @@ -33,6 +33,7 @@ #include "vtkSetGet.h" // for macros #include // for memcpy +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkPixelTransfer { public: @@ -162,5 +163,6 @@ int vtkPixelTransfer::Blit(const vtkPixelExtent& srcWholeExt, const vtkPixelExte return 0; } +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkPixelTransfer.h diff --git a/Common/DataModel/vtkPlane.cxx b/Common/DataModel/vtkPlane.cxx index becf886c7a..0d6c7518d6 100644 --- a/Common/DataModel/vtkPlane.cxx +++ b/Common/DataModel/vtkPlane.cxx @@ -26,6 +26,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlane); //------------------------------------------------------------------------------ @@ -628,3 +629,4 @@ void vtkPlane::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Origin: (" << this->Origin[0] << ", " << this->Origin[1] << ", " << this->Origin[2] << ")\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPlane.h b/Common/DataModel/vtkPlane.h index 696137b2c3..c4790c9c89 100644 --- a/Common/DataModel/vtkPlane.h +++ b/Common/DataModel/vtkPlane.h @@ -28,6 +28,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; // forward declaration class VTKCOMMONDATAMODEL_EXPORT vtkPlane : public vtkImplicitFunction @@ -193,4 +194,5 @@ inline double vtkPlane::DistanceToPlane(double x[3], double n[3], double p0[3]) return (vtkPlaneAbs(n[0] * (x[0] - p0[0]) + n[1] * (x[1] - p0[1]) + n[2] * (x[2] - p0[2]))); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPlaneCollection.cxx b/Common/DataModel/vtkPlaneCollection.cxx index 41ea69e3e5..d6f988f6f7 100644 --- a/Common/DataModel/vtkPlaneCollection.cxx +++ b/Common/DataModel/vtkPlaneCollection.cxx @@ -15,6 +15,7 @@ #include "vtkPlaneCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlaneCollection); void vtkPlaneCollection::PrintSelf(ostream& os, vtkIndent indent) @@ -26,3 +27,4 @@ vtkPlane* vtkPlaneCollection::GetNextPlane(vtkCollectionSimpleIterator& cookie) { return static_cast(this->GetNextItemAsObject(cookie)); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPlaneCollection.h b/Common/DataModel/vtkPlaneCollection.h index 3314104587..ca8f23043e 100644 --- a/Common/DataModel/vtkPlaneCollection.h +++ b/Common/DataModel/vtkPlaneCollection.h @@ -30,6 +30,7 @@ #include "vtkPlane.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkPlaneCollection : public vtkCollection { public: @@ -81,4 +82,5 @@ inline vtkPlane* vtkPlaneCollection::GetNextItem() return static_cast(this->GetNextItemAsObject()); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPlanes.cxx b/Common/DataModel/vtkPlanes.cxx index e5a8880960..dca8209ac9 100644 --- a/Common/DataModel/vtkPlanes.cxx +++ b/Common/DataModel/vtkPlanes.cxx @@ -21,6 +21,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlanes); vtkCxxSetObjectMacro(vtkPlanes, Points, vtkPoints); @@ -377,3 +378,4 @@ void vtkPlanes::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Normals: (none)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPlanes.h b/Common/DataModel/vtkPlanes.h index 6bd7322513..974057dc16 100644 --- a/Common/DataModel/vtkPlanes.h +++ b/Common/DataModel/vtkPlanes.h @@ -42,6 +42,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPlane; class vtkPoints; class vtkDataArray; @@ -142,4 +143,5 @@ private: void operator=(const vtkPlanes&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPlanesIntersection.cxx b/Common/DataModel/vtkPlanesIntersection.cxx index 74648f51c2..211716b1d9 100644 --- a/Common/DataModel/vtkPlanesIntersection.cxx +++ b/Common/DataModel/vtkPlanesIntersection.cxx @@ -24,6 +24,7 @@ #include "vtkObjectFactory.h" #include "vtkPointsProjectedHull.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPlanesIntersection); // Experiment shows that we get plane equation values on the @@ -900,3 +901,4 @@ void vtkPlanesIntersection::PrintSelf(ostream& os, vtkIndent indent) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPlanesIntersection.h b/Common/DataModel/vtkPlanesIntersection.h index acd75f7336..aed1f49593 100644 --- a/Common/DataModel/vtkPlanesIntersection.h +++ b/Common/DataModel/vtkPlanesIntersection.h @@ -45,6 +45,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkPlanes.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkPointsProjectedHull; class vtkCell; @@ -131,4 +132,5 @@ private: vtkPlanesIntersection(const vtkPlanesIntersection&) = delete; void operator=(const vtkPlanesIntersection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPointData.cxx b/Common/DataModel/vtkPointData.cxx index a233eac927..c5ecf61afd 100644 --- a/Common/DataModel/vtkPointData.cxx +++ b/Common/DataModel/vtkPointData.cxx @@ -17,6 +17,7 @@ #include "vtkDataSetAttributes.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPointData); vtkStandardExtendedNewMacro(vtkPointData); @@ -31,3 +32,4 @@ void vtkPointData::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPointData.h b/Common/DataModel/vtkPointData.h index 3cc97761d9..c842b18d8a 100644 --- a/Common/DataModel/vtkPointData.h +++ b/Common/DataModel/vtkPointData.h @@ -31,6 +31,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataSetAttributes.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkPointData : public vtkDataSetAttributes { public: @@ -49,4 +50,5 @@ private: void operator=(const vtkPointData&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPointLocator.cxx b/Common/DataModel/vtkPointLocator.cxx index ebf4ed52a9..6a05a57a15 100644 --- a/Common/DataModel/vtkPointLocator.cxx +++ b/Common/DataModel/vtkPointLocator.cxx @@ -24,6 +24,7 @@ #include //std::sort +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPointLocator); static const int VTK_INITIAL_SIZE = 1000; @@ -1732,3 +1733,4 @@ void vtkPointLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Points: (none)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPointLocator.h b/Common/DataModel/vtkPointLocator.h index 28a3c543c3..69c5995a0b 100644 --- a/Common/DataModel/vtkPointLocator.h +++ b/Common/DataModel/vtkPointLocator.h @@ -49,6 +49,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkIncrementalPointLocator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkIdList; class vtkNeighborPoints; @@ -302,4 +303,5 @@ private: void operator=(const vtkPointLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPointSet.cxx b/Common/DataModel/vtkPointSet.cxx index eb375f2322..3aab486a2c 100644 --- a/Common/DataModel/vtkPointSet.cxx +++ b/Common/DataModel/vtkPointSet.cxx @@ -30,6 +30,7 @@ #include "vtkSmartPointer.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPointSet); vtkStandardExtendedNewMacro(vtkPointSet); @@ -356,3 +357,4 @@ void vtkPointSet::PrintSelf(ostream& os, vtkIndent indent) os << indent << "PointLocator: " << this->PointLocator << "\n"; os << indent << "CellLocator: " << this->CellLocator << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPointSet.h b/Common/DataModel/vtkPointSet.h index fde27d356b..5d858a8973 100644 --- a/Common/DataModel/vtkPointSet.h +++ b/Common/DataModel/vtkPointSet.h @@ -60,6 +60,7 @@ #include "vtkGenericCell.h" // For GetCell #include "vtkPoints.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractPointLocator; class vtkAbstractCellLocator; @@ -295,4 +296,5 @@ inline vtkIdType vtkPointSet::GetNumberOfPoints() } } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPointSetCellIterator.cxx b/Common/DataModel/vtkPointSetCellIterator.cxx index ea1d3f073f..7d98f1b4a9 100644 --- a/Common/DataModel/vtkPointSetCellIterator.cxx +++ b/Common/DataModel/vtkPointSetCellIterator.cxx @@ -20,6 +20,7 @@ #include "vtkPointSet.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPointSetCellIterator); //------------------------------------------------------------------------------ @@ -94,3 +95,4 @@ void vtkPointSetCellIterator::FetchPoints() vtkIdList* pointIds = this->GetPointIds(); this->PointSetPoints->GetPoints(pointIds, this->Points); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPointSetCellIterator.h b/Common/DataModel/vtkPointSetCellIterator.h index 41c7df07c2..4678bee2f0 100644 --- a/Common/DataModel/vtkPointSetCellIterator.h +++ b/Common/DataModel/vtkPointSetCellIterator.h @@ -25,6 +25,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkSmartPointer.h" // For vtkSmartPointer +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkPointSet; @@ -60,4 +61,5 @@ private: void operator=(const vtkPointSetCellIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkPointSetCellIterator_h diff --git a/Common/DataModel/vtkPointsProjectedHull.cxx b/Common/DataModel/vtkPointsProjectedHull.cxx index b44371138f..f191f2a4a4 100644 --- a/Common/DataModel/vtkPointsProjectedHull.cxx +++ b/Common/DataModel/vtkPointsProjectedHull.cxx @@ -20,6 +20,7 @@ #include "vtkPointsProjectedHull.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPointsProjectedHull); static const int xdim = 0, ydim = 1, zdim = 2; @@ -187,6 +188,7 @@ int vtkPointsProjectedHull::RectangleIntersection( return 1; } +VTK_ABI_NAMESPACE_END // // Suppose the points are projected orthogonally in the dir // of the positive x, y or z axis. Compute the points (2 components) @@ -209,6 +211,7 @@ extern "C" int vtkPointsProjectedHullCCW(const void* p1, const void* p2); } +VTK_ABI_NAMESPACE_BEGIN int vtkPointsProjectedHull::GrahamScanAlgorithm(int dir) { int horizAxis = 0, vertAxis = 0; @@ -724,6 +727,7 @@ int vtkPointsProjectedHull::RectangleOutside1DPolygon( return 1; } +VTK_ABI_NAMESPACE_END // The sort functions @@ -772,6 +776,7 @@ extern "C" } } +VTK_ABI_NAMESPACE_BEGIN void vtkPointsProjectedHull::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); @@ -801,3 +806,4 @@ void vtkPointsProjectedHull::PrintSelf(ostream& os, vtkIndent indent) os << indent << "HullSize Z: " << this->HullSize[2] << endl; os << indent << "HullTime Z: " << this->HullTime[2] << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPointsProjectedHull.h b/Common/DataModel/vtkPointsProjectedHull.h index 2ad1bfedac..2a01e133ce 100644 --- a/Common/DataModel/vtkPointsProjectedHull.h +++ b/Common/DataModel/vtkPointsProjectedHull.h @@ -35,6 +35,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkPointsProjectedHull : public vtkPoints { vtkTypeMacro(vtkPointsProjectedHull, vtkPoints); @@ -184,4 +185,5 @@ private: vtkPointsProjectedHull(const vtkPointsProjectedHull&) = delete; void operator=(const vtkPointsProjectedHull&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPolyData.cxx b/Common/DataModel/vtkPolyData.cxx index 121fa5da6e..8de29b5cb1 100644 --- a/Common/DataModel/vtkPolyData.cxx +++ b/Common/DataModel/vtkPolyData.cxx @@ -43,14 +43,17 @@ // vtkPolyDataInternals.h methods: namespace vtkPolyData_detail { +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(CellMap); CellMap::CellMap() = default; CellMap::~CellMap() = default; +VTK_ABI_NAMESPACE_END } // end namespace vtkPolyData_detail +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPolyData); vtkStandardExtendedNewMacro(vtkPolyData); @@ -853,6 +856,8 @@ void vtkPolyData::DeleteCells() this->Cells = nullptr; } +VTK_ABI_NAMESPACE_END + namespace { @@ -888,6 +893,7 @@ struct BuildCellsImpl } // end anon namespace +VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ // Create data structure that allows random access of cells. void vtkPolyData::BuildCells() @@ -2173,3 +2179,4 @@ vtkMTimeType vtkPolyData::GetMTime() } return time; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPolyData.h b/Common/DataModel/vtkPolyData.h index 264dc6e1ca..ffea8b47b7 100644 --- a/Common/DataModel/vtkPolyData.h +++ b/Common/DataModel/vtkPolyData.h @@ -69,6 +69,7 @@ #include "vtkCellLinks.h" // Needed for inline methods #include "vtkPolyDataInternals.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkVertex; class vtkPolyVertex; class vtkLine; @@ -994,4 +995,5 @@ inline void vtkPolyData::GetCellPoints( cells->GetCellAtId(tag.GetCellId(), npts, pts, ptIds); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPolyDataCollection.cxx b/Common/DataModel/vtkPolyDataCollection.cxx index 21d7dec064..026f39c11e 100644 --- a/Common/DataModel/vtkPolyDataCollection.cxx +++ b/Common/DataModel/vtkPolyDataCollection.cxx @@ -15,6 +15,7 @@ #include "vtkPolyDataCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPolyDataCollection); //------------------------------------------------------------------------------ @@ -22,3 +23,4 @@ void vtkPolyDataCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPolyDataCollection.h b/Common/DataModel/vtkPolyDataCollection.h index 896a4017a0..5068be9fa4 100644 --- a/Common/DataModel/vtkPolyDataCollection.h +++ b/Common/DataModel/vtkPolyDataCollection.h @@ -31,6 +31,7 @@ #include "vtkPolyData.h" // Needed for static cast +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkPolyDataCollection : public vtkCollection { public: @@ -70,4 +71,5 @@ private: void operator=(const vtkPolyDataCollection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPolyDataInternals.h b/Common/DataModel/vtkPolyDataInternals.h index d313fa3cd8..58149801c0 100644 --- a/Common/DataModel/vtkPolyDataInternals.h +++ b/Common/DataModel/vtkPolyDataInternals.h @@ -68,6 +68,7 @@ namespace vtkPolyData_detail { +VTK_ABI_NAMESPACE_BEGIN static constexpr vtkTypeUInt64 CELLID_MASK = 0x0fffffffffffffffull; static constexpr vtkTypeUInt64 SHIFTED_TYPE_INDEX_MASK = 0xf000000000000000ull; @@ -302,6 +303,7 @@ private: CellMap& operator=(const CellMap&) = delete; }; +VTK_ABI_NAMESPACE_END } // end namespace vtkPolyData_detail #endif // vtkPolyDataInternals.h diff --git a/Common/DataModel/vtkPolyLine.cxx b/Common/DataModel/vtkPolyLine.cxx index 1062a3a462..cb6e894578 100644 --- a/Common/DataModel/vtkPolyLine.cxx +++ b/Common/DataModel/vtkPolyLine.cxx @@ -30,6 +30,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPolyLine); //------------------------------------------------------------------------------ @@ -501,3 +502,4 @@ void vtkPolyLine::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Line:\n"; this->Line->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPolyLine.h b/Common/DataModel/vtkPolyLine.h index d030e822ef..583553c3a1 100644 --- a/Common/DataModel/vtkPolyLine.h +++ b/Common/DataModel/vtkPolyLine.h @@ -26,6 +26,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkPoints; class vtkCellArray; class vtkLine; @@ -101,4 +102,5 @@ private: void operator=(const vtkPolyLine&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPolyPlane.cxx b/Common/DataModel/vtkPolyPlane.cxx index ca56514e96..c515f91408 100644 --- a/Common/DataModel/vtkPolyPlane.cxx +++ b/Common/DataModel/vtkPolyPlane.cxx @@ -22,6 +22,7 @@ #include "vtkPolyLine.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPolyPlane); vtkCxxSetObjectMacro(vtkPolyPlane, PolyLine, vtkPolyLine); @@ -311,3 +312,4 @@ void vtkPolyPlane::PrintSelf(ostream& os, vtkIndent indent) this->Normals->PrintSelf(os, indent.GetNextIndent()); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPolyPlane.h b/Common/DataModel/vtkPolyPlane.h index f38724ec28..be3424ca80 100644 --- a/Common/DataModel/vtkPolyPlane.h +++ b/Common/DataModel/vtkPolyPlane.h @@ -32,6 +32,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPolyLine; class vtkDoubleArray; @@ -90,4 +91,5 @@ private: void operator=(const vtkPolyPlane&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPolyVertex.cxx b/Common/DataModel/vtkPolyVertex.cxx index fbbb153f7b..5c69d74dff 100644 --- a/Common/DataModel/vtkPolyVertex.cxx +++ b/Common/DataModel/vtkPolyVertex.cxx @@ -23,6 +23,7 @@ #include "vtkPoints.h" #include "vtkVertex.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPolyVertex); //------------------------------------------------------------------------------ @@ -233,3 +234,4 @@ void vtkPolyVertex::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Vertex:\n"; this->Vertex->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPolyVertex.h b/Common/DataModel/vtkPolyVertex.h index ae7b3a2afe..a4e8464da8 100644 --- a/Common/DataModel/vtkPolyVertex.h +++ b/Common/DataModel/vtkPolyVertex.h @@ -26,6 +26,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkVertex; class vtkIncrementalPointLocator; @@ -80,4 +81,5 @@ private: void operator=(const vtkPolyVertex&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPolygon.cxx b/Common/DataModel/vtkPolygon.cxx index 52b5f8fcca..b755cf8701 100644 --- a/Common/DataModel/vtkPolygon.cxx +++ b/Common/DataModel/vtkPolygon.cxx @@ -36,6 +36,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPolygon); #define VTK_POLYGON_TOL 1.e-08 // Absolute tolerance for testing near polygon boundary @@ -2267,3 +2268,4 @@ int vtkPolygon::IntersectConvex2DCells( return 0; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPolygon.h b/Common/DataModel/vtkPolygon.h index 0fb35c9711..8d866d8620 100644 --- a/Common/DataModel/vtkPolygon.h +++ b/Common/DataModel/vtkPolygon.h @@ -28,6 +28,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkIdTypeArray; class vtkLine; @@ -318,4 +319,5 @@ private: void operator=(const vtkPolygon&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPolyhedron.cxx b/Common/DataModel/vtkPolyhedron.cxx index f19568ddb3..758789010b 100644 --- a/Common/DataModel/vtkPolyhedron.cxx +++ b/Common/DataModel/vtkPolyhedron.cxx @@ -41,6 +41,7 @@ PURPOSE. See the above copyright notice for more information. #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPolyhedron); // Special typedef @@ -2493,3 +2494,4 @@ void vtkPolyhedron::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Faces:\n"; this->GlobalFaces->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPolyhedron.h b/Common/DataModel/vtkPolyhedron.h index 66d9073e39..8c004a445b 100644 --- a/Common/DataModel/vtkPolyhedron.h +++ b/Common/DataModel/vtkPolyhedron.h @@ -38,6 +38,7 @@ #include "vtkCell3D.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkIdTypeArray; class vtkCellArray; class vtkTriangle; @@ -345,4 +346,5 @@ inline int vtkPolyhedron::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkPyramid.cxx b/Common/DataModel/vtkPyramid.cxx index b67850b6e8..f446cfd266 100644 --- a/Common/DataModel/vtkPyramid.cxx +++ b/Common/DataModel/vtkPyramid.cxx @@ -31,6 +31,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkPyramid); namespace @@ -1073,3 +1074,4 @@ void vtkPyramid::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Quad:\n"; this->Quad->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkPyramid.h b/Common/DataModel/vtkPyramid.h index 784e6cc1fd..f9c26be5fa 100644 --- a/Common/DataModel/vtkPyramid.h +++ b/Common/DataModel/vtkPyramid.h @@ -34,6 +34,7 @@ #include "vtkCell3D.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkQuad; class vtkTriangle; @@ -211,4 +212,5 @@ inline int vtkPyramid::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuad.cxx b/Common/DataModel/vtkQuad.cxx index 0b7bdc7015..5cd8771477 100644 --- a/Common/DataModel/vtkQuad.cxx +++ b/Common/DataModel/vtkQuad.cxx @@ -25,6 +25,7 @@ #include "vtkPoints.h" #include "vtkTriangle.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuad); static const double VTK_DIVERGED = 1.e6; @@ -1020,3 +1021,4 @@ void vtkQuad::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Triangle:\n"; this->Triangle->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuad.h b/Common/DataModel/vtkQuad.h index 69e45642e4..c44bf58949 100644 --- a/Common/DataModel/vtkQuad.h +++ b/Common/DataModel/vtkQuad.h @@ -28,6 +28,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkTriangle; class vtkIncrementalPointLocator; @@ -123,4 +124,5 @@ inline int vtkQuad::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticEdge.cxx b/Common/DataModel/vtkQuadraticEdge.cxx index 594e39b821..522eaf2919 100644 --- a/Common/DataModel/vtkQuadraticEdge.cxx +++ b/Common/DataModel/vtkQuadraticEdge.cxx @@ -20,6 +20,7 @@ #include "vtkObjectFactory.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticEdge); //------------------------------------------------------------------------------ @@ -275,3 +276,4 @@ void vtkQuadraticEdge::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Line:\n"; this->Line->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticEdge.h b/Common/DataModel/vtkQuadraticEdge.h index 26442c0ef1..95ee9c96b9 100644 --- a/Common/DataModel/vtkQuadraticEdge.h +++ b/Common/DataModel/vtkQuadraticEdge.h @@ -34,6 +34,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkDoubleArray; @@ -123,4 +124,5 @@ inline int vtkQuadraticEdge::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticHexahedron.cxx b/Common/DataModel/vtkQuadraticHexahedron.cxx index ef1a6fe29c..01be8539b2 100644 --- a/Common/DataModel/vtkQuadraticHexahedron.cxx +++ b/Common/DataModel/vtkQuadraticHexahedron.cxx @@ -25,6 +25,7 @@ #include "vtkQuadraticEdge.h" #include "vtkQuadraticQuad.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticHexahedron); //------------------------------------------------------------------------------ @@ -992,3 +993,4 @@ void vtkQuadraticHexahedron::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticHexahedron.h b/Common/DataModel/vtkQuadraticHexahedron.h index 3aa8e77662..895c2705e8 100644 --- a/Common/DataModel/vtkQuadraticHexahedron.h +++ b/Common/DataModel/vtkQuadraticHexahedron.h @@ -37,6 +37,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkQuadraticQuad; class vtkHexahedron; @@ -145,4 +146,5 @@ private: void operator=(const vtkQuadraticHexahedron&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticLinearQuad.cxx b/Common/DataModel/vtkQuadraticLinearQuad.cxx index 3a0df9c2fe..53c2ac278a 100644 --- a/Common/DataModel/vtkQuadraticLinearQuad.cxx +++ b/Common/DataModel/vtkQuadraticLinearQuad.cxx @@ -26,6 +26,7 @@ #include "vtkQuad.h" #include "vtkQuadraticEdge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticLinearQuad); //------------------------------------------------------------------------------ @@ -446,3 +447,4 @@ void vtkQuadraticLinearQuad::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticLinearQuad.h b/Common/DataModel/vtkQuadraticLinearQuad.h index d83d12fd33..cd8d20c4a5 100644 --- a/Common/DataModel/vtkQuadraticLinearQuad.h +++ b/Common/DataModel/vtkQuadraticLinearQuad.h @@ -39,6 +39,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkLine; class vtkQuad; @@ -145,4 +146,5 @@ inline int vtkQuadraticLinearQuad::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticLinearWedge.cxx b/Common/DataModel/vtkQuadraticLinearWedge.cxx index ec01b926fd..39bb4b0034 100644 --- a/Common/DataModel/vtkQuadraticLinearWedge.cxx +++ b/Common/DataModel/vtkQuadraticLinearWedge.cxx @@ -28,6 +28,7 @@ #include "vtkQuadraticTriangle.h" #include "vtkWedge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticLinearWedge); //------------------------------------------------------------------------------ @@ -672,3 +673,4 @@ void vtkQuadraticLinearWedge::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticLinearWedge.h b/Common/DataModel/vtkQuadraticLinearWedge.h index 4f613a364e..f8ce99e79a 100644 --- a/Common/DataModel/vtkQuadraticLinearWedge.h +++ b/Common/DataModel/vtkQuadraticLinearWedge.h @@ -42,6 +42,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkLine; class vtkQuadraticLinearQuad; @@ -168,4 +169,5 @@ inline int vtkQuadraticLinearWedge::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticPolygon.cxx b/Common/DataModel/vtkQuadraticPolygon.cxx index 83a2945ef6..1adc709606 100644 --- a/Common/DataModel/vtkQuadraticPolygon.cxx +++ b/Common/DataModel/vtkQuadraticPolygon.cxx @@ -23,6 +23,7 @@ #include "vtkPolygon.h" #include "vtkQuadraticEdge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticPolygon); //------------------------------------------------------------------------------ @@ -443,3 +444,4 @@ void vtkQuadraticPolygon::Derivatives(int vtkNotUsed(subId), const double vtkNot const double* vtkNotUsed(values), int vtkNotUsed(dim), double* vtkNotUsed(derivs)) { } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticPolygon.h b/Common/DataModel/vtkQuadraticPolygon.h index 9206051de1..35fb222f99 100644 --- a/Common/DataModel/vtkQuadraticPolygon.h +++ b/Common/DataModel/vtkQuadraticPolygon.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkPolygon; class vtkIdTypeArray; @@ -150,4 +151,5 @@ private: void operator=(const vtkQuadraticPolygon&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticPyramid.cxx b/Common/DataModel/vtkQuadraticPyramid.cxx index 8d5d9e5a82..ee69a2ec3f 100644 --- a/Common/DataModel/vtkQuadraticPyramid.cxx +++ b/Common/DataModel/vtkQuadraticPyramid.cxx @@ -27,6 +27,7 @@ #include "vtkQuadraticTriangle.h" #include "vtkTetra.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticPyramid); //------------------------------------------------------------------------------ @@ -896,3 +897,4 @@ void vtkQuadraticPyramid::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticPyramid.h b/Common/DataModel/vtkQuadraticPyramid.h index d6a90e1775..92ef054987 100644 --- a/Common/DataModel/vtkQuadraticPyramid.h +++ b/Common/DataModel/vtkQuadraticPyramid.h @@ -42,6 +42,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkQuadraticQuad; class vtkQuadraticTriangle; @@ -185,4 +186,5 @@ inline int vtkQuadraticPyramid::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticQuad.cxx b/Common/DataModel/vtkQuadraticQuad.cxx index 22caa561f5..018b057e7e 100644 --- a/Common/DataModel/vtkQuadraticQuad.cxx +++ b/Common/DataModel/vtkQuadraticQuad.cxx @@ -23,6 +23,7 @@ #include "vtkQuad.h" #include "vtkQuadraticEdge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticQuad); //------------------------------------------------------------------------------ @@ -581,3 +582,4 @@ void vtkQuadraticQuad::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticQuad.h b/Common/DataModel/vtkQuadraticQuad.h index 23f070a769..0ecfa89cb9 100644 --- a/Common/DataModel/vtkQuadraticQuad.h +++ b/Common/DataModel/vtkQuadraticQuad.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkQuad; class vtkDoubleArray; @@ -139,4 +140,5 @@ inline int vtkQuadraticQuad::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticTetra.cxx b/Common/DataModel/vtkQuadraticTetra.cxx index 6e0fda750c..3c0552bddb 100644 --- a/Common/DataModel/vtkQuadraticTetra.cxx +++ b/Common/DataModel/vtkQuadraticTetra.cxx @@ -23,6 +23,7 @@ #include "vtkQuadraticTriangle.h" #include "vtkTetra.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticTetra); //------------------------------------------------------------------------------ @@ -651,3 +652,4 @@ void vtkQuadraticTetra::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticTetra.h b/Common/DataModel/vtkQuadraticTetra.h index 38a2446c09..3832d6eeb4 100644 --- a/Common/DataModel/vtkQuadraticTetra.h +++ b/Common/DataModel/vtkQuadraticTetra.h @@ -40,6 +40,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkQuadraticTriangle; class vtkTetra; @@ -152,4 +153,5 @@ private: void operator=(const vtkQuadraticTetra&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticTriangle.cxx b/Common/DataModel/vtkQuadraticTriangle.cxx index 5972623840..cd77c159cf 100644 --- a/Common/DataModel/vtkQuadraticTriangle.cxx +++ b/Common/DataModel/vtkQuadraticTriangle.cxx @@ -22,6 +22,7 @@ #include "vtkQuadraticEdge.h" #include "vtkTriangle.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticTriangle); //------------------------------------------------------------------------------ @@ -441,3 +442,4 @@ void vtkQuadraticTriangle::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticTriangle.h b/Common/DataModel/vtkQuadraticTriangle.h index 31feb96ae5..0c3fe33a47 100644 --- a/Common/DataModel/vtkQuadraticTriangle.h +++ b/Common/DataModel/vtkQuadraticTriangle.h @@ -36,6 +36,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkTriangle; class vtkDoubleArray; @@ -136,4 +137,5 @@ inline int vtkQuadraticTriangle::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadraticWedge.cxx b/Common/DataModel/vtkQuadraticWedge.cxx index 50a2a76ad4..2876f91cbc 100644 --- a/Common/DataModel/vtkQuadraticWedge.cxx +++ b/Common/DataModel/vtkQuadraticWedge.cxx @@ -26,6 +26,7 @@ #include "vtkQuadraticTriangle.h" #include "vtkWedge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadraticWedge); //------------------------------------------------------------------------------ @@ -768,3 +769,4 @@ void vtkQuadraticWedge::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadraticWedge.h b/Common/DataModel/vtkQuadraticWedge.h index daac17590b..b5b2c267a3 100644 --- a/Common/DataModel/vtkQuadraticWedge.h +++ b/Common/DataModel/vtkQuadraticWedge.h @@ -39,6 +39,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkQuadraticQuad; class vtkQuadraticTriangle; @@ -162,4 +163,5 @@ inline int vtkQuadraticWedge::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadratureSchemeDefinition.cxx b/Common/DataModel/vtkQuadratureSchemeDefinition.cxx index bd44bbca7e..929b777469 100644 --- a/Common/DataModel/vtkQuadratureSchemeDefinition.cxx +++ b/Common/DataModel/vtkQuadratureSchemeDefinition.cxx @@ -26,6 +26,7 @@ using std::ostringstream; #include using std::string; +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadratureSchemeDefinition); //------------------------------------------------------------------------------ @@ -481,3 +482,4 @@ int vtkQuadratureSchemeDefinition::RestoreState(vtkXMLDataElement* root) return 1; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadratureSchemeDefinition.h b/Common/DataModel/vtkQuadratureSchemeDefinition.h index a5c17c3fd4..b721c5c0c0 100644 --- a/Common/DataModel/vtkQuadratureSchemeDefinition.h +++ b/Common/DataModel/vtkQuadratureSchemeDefinition.h @@ -38,6 +38,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkInformationQuadratureSchemeDefinitionVectorKey; class vtkInformationStringKey; class vtkXMLDataElement; @@ -167,4 +168,5 @@ private: double* QuadratureWeights; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkQuadric.cxx b/Common/DataModel/vtkQuadric.cxx index a640bbd3fb..859de62ff1 100644 --- a/Common/DataModel/vtkQuadric.cxx +++ b/Common/DataModel/vtkQuadric.cxx @@ -15,6 +15,7 @@ #include "vtkQuadric.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkQuadric); // Construct quadric with all coefficients = 1. @@ -97,3 +98,4 @@ void vtkQuadric::PrintSelf(ostream& os, vtkIndent indent) << "\n\ta6: " << this->Coefficients[6] << "\n\ta7: " << this->Coefficients[7] << "\n\ta8: " << this->Coefficients[8] << "\n\ta9: " << this->Coefficients[9] << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkQuadric.h b/Common/DataModel/vtkQuadric.h index abfe969d6e..5ec2723f09 100644 --- a/Common/DataModel/vtkQuadric.h +++ b/Common/DataModel/vtkQuadric.h @@ -27,6 +27,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkQuadric : public vtkImplicitFunction { public: @@ -72,4 +73,5 @@ private: void operator=(const vtkQuadric&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkRect.h b/Common/DataModel/vtkRect.h index 146ea87bc1..64ad775755 100644 --- a/Common/DataModel/vtkRect.h +++ b/Common/DataModel/vtkRect.h @@ -31,6 +31,7 @@ #include "vtkMath.h" // for Min, Max +VTK_ABI_NAMESPACE_BEGIN template class vtkRect : public vtkVector { @@ -360,5 +361,6 @@ public: } }; +VTK_ABI_NAMESPACE_END #endif // vtkRect_h // VTK-HeaderTest-Exclude: vtkRect.h diff --git a/Common/DataModel/vtkRectilinearGrid.cxx b/Common/DataModel/vtkRectilinearGrid.cxx index 54b7ea8069..9468d336ed 100644 --- a/Common/DataModel/vtkRectilinearGrid.cxx +++ b/Common/DataModel/vtkRectilinearGrid.cxx @@ -33,6 +33,7 @@ #include "vtkVertex.h" #include "vtkVoxel.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkRectilinearGrid); vtkStandardExtendedNewMacro(vtkRectilinearGrid); @@ -1574,3 +1575,4 @@ bool vtkRectilinearGrid::HasAnyBlankCells() int cellBlanking = this->CellData->HasAnyGhostBitSet(vtkDataSetAttributes::HIDDENCELL); return cellBlanking || this->HasAnyBlankPoints(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkRectilinearGrid.h b/Common/DataModel/vtkRectilinearGrid.h index d46673aa0f..ca965c4fee 100644 --- a/Common/DataModel/vtkRectilinearGrid.h +++ b/Common/DataModel/vtkRectilinearGrid.h @@ -41,6 +41,7 @@ #include "vtkDataSet.h" #include "vtkStructuredData.h" // For inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkVertex; class vtkLine; class vtkPixel; @@ -365,4 +366,5 @@ inline vtkIdType vtkRectilinearGrid::ComputeCellId(int ijk[3]) return vtkStructuredData::ComputeCellId(this->Dimensions, ijk); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkReebGraph.cxx b/Common/DataModel/vtkReebGraph.cxx index f4fc2e0e43..9279f7587d 100644 --- a/Common/DataModel/vtkReebGraph.cxx +++ b/Common/DataModel/vtkReebGraph.cxx @@ -39,6 +39,7 @@ //------------------------------------------------------------------------------ // Contain all of the internal data structures, and macros, in the // implementation. +VTK_ABI_NAMESPACE_BEGIN namespace { //------------------------------------------------------------------------------ @@ -3381,3 +3382,4 @@ inline vtkIdType vtkReebGraph::Implementation::AddArc(vtkIdType nodeId0, vtkIdTy vtkIdType nodevtkReebArcble[] = { nodeId0, nodeId1 }; return AddPath(2, nodevtkReebArcble, 0); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkReebGraph.h b/Common/DataModel/vtkReebGraph.h index cfc3182f20..8396fdf0d8 100644 --- a/Common/DataModel/vtkReebGraph.h +++ b/Common/DataModel/vtkReebGraph.h @@ -121,6 +121,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkMutableDirectedGraph.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataArray; class vtkDataSet; class vtkIdList; @@ -363,4 +364,5 @@ private: void operator=(const vtkReebGraph&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkReebGraphSimplificationMetric.cxx b/Common/DataModel/vtkReebGraphSimplificationMetric.cxx index 79ebae10f8..6434af2e04 100644 --- a/Common/DataModel/vtkReebGraphSimplificationMetric.cxx +++ b/Common/DataModel/vtkReebGraphSimplificationMetric.cxx @@ -18,6 +18,7 @@ #include "vtkInformationVector.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkReebGraphSimplificationMetric); //------------------------------------------------------------------------------ @@ -46,3 +47,4 @@ double vtkReebGraphSimplificationMetric::ComputeMetric(vtkDataSet* vtkNotUsed(me printf("too bad, wrong code\n"); return 0; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkReebGraphSimplificationMetric.h b/Common/DataModel/vtkReebGraphSimplificationMetric.h index b1672fef39..654e41e7b9 100644 --- a/Common/DataModel/vtkReebGraphSimplificationMetric.h +++ b/Common/DataModel/vtkReebGraphSimplificationMetric.h @@ -49,6 +49,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class vtkDataArray; class vtkAbstractArray; @@ -103,4 +104,5 @@ private: void operator=(const vtkReebGraphSimplificationMetric&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkSelection.cxx b/Common/DataModel/vtkSelection.cxx index 1d825f6c2f..a4b765c5ef 100644 --- a/Common/DataModel/vtkSelection.cxx +++ b/Common/DataModel/vtkSelection.cxx @@ -42,6 +42,7 @@ //============================================================================ namespace parser { +VTK_ABI_NAMESPACE_BEGIN class Node { public: @@ -168,8 +169,10 @@ public: os << ")"; } }; +VTK_ABI_NAMESPACE_END } // namespace parser +VTK_ABI_NAMESPACE_BEGIN //============================================================================ class vtkSelection::vtkInternals { @@ -793,3 +796,4 @@ void vtkSelection::Dump(ostream& os) } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSelection.h b/Common/DataModel/vtkSelection.h index f05803d855..056d51c7e8 100644 --- a/Common/DataModel/vtkSelection.h +++ b/Common/DataModel/vtkSelection.h @@ -47,6 +47,7 @@ #include // for unique_ptr. #include // for string. +VTK_ABI_NAMESPACE_BEGIN class vtkSelectionNode; class vtkSignedCharArray; @@ -236,4 +237,5 @@ inline vtkSmartPointer vtkSelection::Evaluate(const MapType& return this->Evaluate(&values[0], num_nodes); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkSelectionNode.cxx b/Common/DataModel/vtkSelectionNode.cxx index d236ab5362..b215d9aa3b 100644 --- a/Common/DataModel/vtkSelectionNode.cxx +++ b/Common/DataModel/vtkSelectionNode.cxx @@ -34,6 +34,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSelectionNode); vtkCxxSetObjectMacro(vtkSelectionNode, SelectionData, vtkDataSetAttributes); @@ -551,3 +552,4 @@ int vtkSelectionNode::ConvertAttributeTypeToSelectionField(int attrType) return vtkSelectionNode::CELL; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSelectionNode.h b/Common/DataModel/vtkSelectionNode.h index caa27f67c7..0d8c1d82a7 100644 --- a/Common/DataModel/vtkSelectionNode.h +++ b/Common/DataModel/vtkSelectionNode.h @@ -223,6 +223,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractArray; class vtkDataSetAttributes; class vtkInformation; @@ -535,4 +536,5 @@ private: void operator=(const vtkSelectionNode&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkSimpleCellTessellator.cxx b/Common/DataModel/vtkSimpleCellTessellator.cxx index 23604b32f0..a22dbc36f2 100644 --- a/Common/DataModel/vtkSimpleCellTessellator.cxx +++ b/Common/DataModel/vtkSimpleCellTessellator.cxx @@ -38,6 +38,7 @@ // format of the arrays LeftPoint, MidPoint, RightPoint is global, parametric, // attributes: xyz rst [abc de...] +VTK_ABI_NAMESPACE_BEGIN const int PARAMETRIC_OFFSET = 3; const int ATTRIBUTES_OFFSET = 6; @@ -2789,3 +2790,4 @@ int vtkSimpleCellTessellator::FacesAreEqual(const vtkIdType* originalFace, const } return result; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSimpleCellTessellator.h b/Common/DataModel/vtkSimpleCellTessellator.h index e3059c231d..dad9c1bfdb 100644 --- a/Common/DataModel/vtkSimpleCellTessellator.h +++ b/Common/DataModel/vtkSimpleCellTessellator.h @@ -48,6 +48,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkGenericCellTessellator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkTriangleTile; class vtkTetraTile; class vtkCellArray; @@ -403,4 +404,5 @@ private: friend class vtkTriangleTile; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkSmoothErrorMetric.cxx b/Common/DataModel/vtkSmoothErrorMetric.cxx index 9f59b4ffe2..bcf0321f6d 100644 --- a/Common/DataModel/vtkSmoothErrorMetric.cxx +++ b/Common/DataModel/vtkSmoothErrorMetric.cxx @@ -22,6 +22,7 @@ #include "vtkObjectFactory.h" #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSmoothErrorMetric); //------------------------------------------------------------------------------ @@ -175,3 +176,4 @@ void vtkSmoothErrorMetric::PrintSelf(ostream& os, vtkIndent indent) os << indent << "AngleTolerance: " << this->AngleTolerance << endl; os << indent << "CosTolerance: " << this->CosTolerance << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSmoothErrorMetric.h b/Common/DataModel/vtkSmoothErrorMetric.h index 00a6fd30e2..0b02de3f22 100644 --- a/Common/DataModel/vtkSmoothErrorMetric.h +++ b/Common/DataModel/vtkSmoothErrorMetric.h @@ -34,6 +34,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkGenericSubdivisionErrorMetric.h" +VTK_ABI_NAMESPACE_BEGIN class vtkGenericDataSet; class VTKCOMMONDATAMODEL_EXPORT vtkSmoothErrorMetric : public vtkGenericSubdivisionErrorMetric @@ -115,4 +116,5 @@ private: void operator=(const vtkSmoothErrorMetric&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkSortFieldData.cxx b/Common/DataModel/vtkSortFieldData.cxx index 9ea74696fd..27950014a0 100644 --- a/Common/DataModel/vtkSortFieldData.cxx +++ b/Common/DataModel/vtkSortFieldData.cxx @@ -21,6 +21,7 @@ #include "vtkObjectFactory.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSortFieldData); //------------------------------------------------------------------------------ @@ -105,3 +106,4 @@ void vtkSortFieldData::PrintSelf(ostream& os, vtkIndent indent) } // vtkSortFieldData methods ------------------------------------------------------- +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSortFieldData.h b/Common/DataModel/vtkSortFieldData.h index c54f1fa2d4..5ce890c59e 100644 --- a/Common/DataModel/vtkSortFieldData.h +++ b/Common/DataModel/vtkSortFieldData.h @@ -47,6 +47,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkSortDataArray.h" +VTK_ABI_NAMESPACE_BEGIN class vtkFieldData; class VTKCOMMONDATAMODEL_EXPORT vtkSortFieldData : public vtkSortDataArray @@ -114,4 +115,5 @@ private: void operator=(const vtkSortFieldData&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkSortFieldData_h diff --git a/Common/DataModel/vtkSphere.cxx b/Common/DataModel/vtkSphere.cxx index fac70aa8bb..dd74191389 100644 --- a/Common/DataModel/vtkSphere.cxx +++ b/Common/DataModel/vtkSphere.cxx @@ -18,6 +18,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSphere); //------------------------------------------------------------------------------ @@ -392,3 +393,4 @@ void vtkSphere::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Center: (" << this->Center[0] << ", " << this->Center[1] << ", " << this->Center[2] << ")\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSphere.h b/Common/DataModel/vtkSphere.h index 793e00e865..37ead5cf8f 100644 --- a/Common/DataModel/vtkSphere.h +++ b/Common/DataModel/vtkSphere.h @@ -28,6 +28,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkSphere : public vtkImplicitFunction { public: @@ -119,4 +120,5 @@ private: void operator=(const vtkSphere&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkSpheres.cxx b/Common/DataModel/vtkSpheres.cxx index f0a583fc82..822cab94de 100644 --- a/Common/DataModel/vtkSpheres.cxx +++ b/Common/DataModel/vtkSpheres.cxx @@ -21,6 +21,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSpheres); vtkCxxSetObjectMacro(vtkSpheres, Centers, vtkPoints); @@ -215,3 +216,4 @@ void vtkSpheres::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Radii: (none)\n"; } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSpheres.h b/Common/DataModel/vtkSpheres.h index 3bb4f46d2e..9e66fa7843 100644 --- a/Common/DataModel/vtkSpheres.h +++ b/Common/DataModel/vtkSpheres.h @@ -35,6 +35,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImplicitFunction.h" +VTK_ABI_NAMESPACE_BEGIN class vtkSphere; class vtkPoints; class vtkDataArray; @@ -116,4 +117,5 @@ private: void operator=(const vtkSpheres&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkSphericalPointIterator.cxx b/Common/DataModel/vtkSphericalPointIterator.cxx index c3ee7b67d8..abf8c0087a 100644 --- a/Common/DataModel/vtkSphericalPointIterator.cxx +++ b/Common/DataModel/vtkSphericalPointIterator.cxx @@ -25,6 +25,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSphericalPointIterator); //============================================================================= @@ -616,3 +617,4 @@ void vtkSphericalPointIterator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Axes: " << this->Axes << "\n"; os << indent << "Sorting: " << this->Sorting << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSphericalPointIterator.h b/Common/DataModel/vtkSphericalPointIterator.h index f299bb69de..6f9a861a81 100644 --- a/Common/DataModel/vtkSphericalPointIterator.h +++ b/Common/DataModel/vtkSphericalPointIterator.h @@ -82,6 +82,7 @@ #include // for std::unique_ptr +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkPolyData; struct SpiralPointIterator; @@ -282,4 +283,5 @@ private: void operator=(const vtkSphericalPointIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkSphericalPointIterator_h diff --git a/Common/DataModel/vtkSpline.cxx b/Common/DataModel/vtkSpline.cxx index 4c98cffd60..81af192ce5 100644 --- a/Common/DataModel/vtkSpline.cxx +++ b/Common/DataModel/vtkSpline.cxx @@ -19,6 +19,7 @@ //------------------------------------------------------------------------------ // Construct a spline with the following defaults: // ClampValueOff +VTK_ABI_NAMESPACE_BEGIN vtkSpline::vtkSpline() { this->ComputeTime = 0; @@ -227,3 +228,4 @@ void vtkSpline::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Closed: " << (this->Closed ? "On\n" : "Off\n"); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSpline.h b/Common/DataModel/vtkSpline.h index 84c01d511b..a809b66036 100644 --- a/Common/DataModel/vtkSpline.h +++ b/Common/DataModel/vtkSpline.h @@ -57,6 +57,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkPiecewiseFunction; class VTKCOMMONDATAMODEL_EXPORT vtkSpline : public vtkObject @@ -200,4 +201,5 @@ private: void operator=(const vtkSpline&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStaticCellLinks.cxx b/Common/DataModel/vtkStaticCellLinks.cxx index 7aeebe1377..844b483890 100644 --- a/Common/DataModel/vtkStaticCellLinks.cxx +++ b/Common/DataModel/vtkStaticCellLinks.cxx @@ -15,6 +15,7 @@ #include "vtkStaticCellLinks.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStaticCellLinks); //------------------------------------------------------------------------------ @@ -36,3 +37,4 @@ void vtkStaticCellLinks::PrintSelf(ostream& os, vtkIndent indent) this->Superclass::PrintSelf(os, indent); os << indent << "Implementation: " << this->Impl << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStaticCellLinks.h b/Common/DataModel/vtkStaticCellLinks.h index 18652ee2eb..50b2c071f2 100644 --- a/Common/DataModel/vtkStaticCellLinks.h +++ b/Common/DataModel/vtkStaticCellLinks.h @@ -47,6 +47,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkStaticCellLinksTemplate.h" // For implementations +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class vtkCellArray; @@ -143,4 +144,5 @@ private: void operator=(const vtkStaticCellLinks&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStaticCellLinksTemplate.h b/Common/DataModel/vtkStaticCellLinksTemplate.h index 4357dd729a..aa16677778 100644 --- a/Common/DataModel/vtkStaticCellLinksTemplate.h +++ b/Common/DataModel/vtkStaticCellLinksTemplate.h @@ -45,14 +45,19 @@ #ifndef vtkStaticCellLinksTemplate_h #define vtkStaticCellLinksTemplate_h +#include "vtkABINamespace.h" + +VTK_ABI_NAMESPACE_BEGIN class vtkDataSet; class vtkPolyData; class vtkUnstructuredGrid; class vtkExplicitStructuredGrid; class vtkCellArray; +VTK_ABI_NAMESPACE_END #include "vtkAbstractCellLinks.h" +VTK_ABI_NAMESPACE_BEGIN template class vtkStaticCellLinksTemplate { @@ -172,6 +177,7 @@ private: void operator=(const vtkStaticCellLinksTemplate&) = delete; }; +VTK_ABI_NAMESPACE_END #include "vtkStaticCellLinksTemplate.txx" #endif diff --git a/Common/DataModel/vtkStaticCellLinksTemplate.txx b/Common/DataModel/vtkStaticCellLinksTemplate.txx index 7d7c4c2688..1a137a3ab6 100644 --- a/Common/DataModel/vtkStaticCellLinksTemplate.txx +++ b/Common/DataModel/vtkStaticCellLinksTemplate.txx @@ -35,6 +35,7 @@ //---------------------------------------------------------------------------- // Default constructor. BuildLinks() does most of the work. +VTK_ABI_NAMESPACE_BEGIN template vtkStaticCellLinksTemplate::vtkStaticCellLinksTemplate() : LinksSize(0) @@ -167,9 +168,11 @@ void vtkStaticCellLinksTemplate::BuildLinks(vtkDataSet* ds) cellPts->Delete(); } +VTK_ABI_NAMESPACE_END namespace vtkSCLT_detail { +VTK_ABI_NAMESPACE_BEGIN struct CountPoints { @@ -252,8 +255,10 @@ struct BuildLinksThreaded } }; +VTK_ABI_NAMESPACE_END } // end namespace vtkSCLT_detail +VTK_ABI_NAMESPACE_BEGIN //---------------------------------------------------------------------------- // Build the link list array for unstructured grids. Note this is a serial // implementation: while there is another method (threaded) that is usually @@ -290,6 +295,7 @@ void vtkStaticCellLinksTemplate::SerialBuildLinks( this->Offsets[numPts] = this->LinksSize; } +VTK_ABI_NAMESPACE_END //---------------------------------------------------------------------------- // Threaded implementation of BuildLinks() using vtkSMPTools and std::atomic. @@ -340,6 +346,7 @@ struct InsertLinks } // anonymous +VTK_ABI_NAMESPACE_BEGIN //---------------------------------------------------------------------------- // Build the link list array for unstructured grids. Note this is a threaded // implementation: it uses SMPTools and atomics to prevent race situations. @@ -672,4 +679,5 @@ void vtkStaticCellLinksTemplate::SelectCells( }); // end lambda } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStaticCellLocator.cxx b/Common/DataModel/vtkStaticCellLocator.cxx index 08c8970bf7..2e8ef2b6d5 100644 --- a/Common/DataModel/vtkStaticCellLocator.cxx +++ b/Common/DataModel/vtkStaticCellLocator.cxx @@ -35,6 +35,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStaticCellLocator); //------------------------------------------------------------------------------ @@ -1822,3 +1823,4 @@ void vtkStaticCellLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Large IDs: " << this->LargeIds << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStaticCellLocator.h b/Common/DataModel/vtkStaticCellLocator.h index b89b67f40a..e9cc2d253c 100644 --- a/Common/DataModel/vtkStaticCellLocator.h +++ b/Common/DataModel/vtkStaticCellLocator.h @@ -54,6 +54,7 @@ #include "vtkDeprecation.h" // For VTK_DEPRECATED_IN_9_2_0 // Forward declarations for PIMPL +VTK_ABI_NAMESPACE_BEGIN struct vtkCellBinner; struct vtkCellProcessor; @@ -287,4 +288,5 @@ private: void operator=(const vtkStaticCellLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStaticEdgeLocatorTemplate.h b/Common/DataModel/vtkStaticEdgeLocatorTemplate.h index a8d1622b5b..bc2dc87a03 100644 --- a/Common/DataModel/vtkStaticEdgeLocatorTemplate.h +++ b/Common/DataModel/vtkStaticEdgeLocatorTemplate.h @@ -63,6 +63,8 @@ #ifndef vtkStaticEdgeLocatorTemplate_h #define vtkStaticEdgeLocatorTemplate_h +#include "vtkABINamespace.h" + #include #include @@ -72,6 +74,7 @@ * sort) by using smaller types (32-int versus 64-bit vtkIdType). It is * required that V0 < V1; the tuple constructor enforces this. */ +VTK_ABI_NAMESPACE_BEGIN template struct EdgeTuple { @@ -298,6 +301,7 @@ private: void operator=(const vtkStaticEdgeLocatorTemplate&) = delete; }; +VTK_ABI_NAMESPACE_END #include "vtkStaticEdgeLocatorTemplate.txx" #endif diff --git a/Common/DataModel/vtkStaticEdgeLocatorTemplate.txx b/Common/DataModel/vtkStaticEdgeLocatorTemplate.txx index 7b948d10db..f2c22aaa1e 100644 --- a/Common/DataModel/vtkStaticEdgeLocatorTemplate.txx +++ b/Common/DataModel/vtkStaticEdgeLocatorTemplate.txx @@ -21,6 +21,7 @@ //---------------------------------------------------------------------------- // Gather coincident edges into contiguous runs. Use this for merging edges. +VTK_ABI_NAMESPACE_BEGIN template const IDType* vtkStaticEdgeLocatorTemplate::MergeEdges( vtkIdType numEdges, EdgeTupleType* mergeArray, vtkIdType& numUniqueEdges) @@ -110,4 +111,5 @@ vtkIdType vtkStaticEdgeLocatorTemplate::BuildLocator( return this->NumEdges; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStaticPointLocator.cxx b/Common/DataModel/vtkStaticPointLocator.cxx index b31c37f866..50dfbf1146 100644 --- a/Common/DataModel/vtkStaticPointLocator.cxx +++ b/Common/DataModel/vtkStaticPointLocator.cxx @@ -32,6 +32,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStaticPointLocator); // There are stack-allocated bucket neighbor lists. This is the initial @@ -2393,3 +2394,4 @@ void vtkStaticPointLocator::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Traversal Order: " << (this->TraversalOrder ? "On\n" : "Off\n"); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStaticPointLocator.h b/Common/DataModel/vtkStaticPointLocator.h index 1d5629697e..b1a53a59b0 100644 --- a/Common/DataModel/vtkStaticPointLocator.h +++ b/Common/DataModel/vtkStaticPointLocator.h @@ -60,6 +60,7 @@ #include "vtkAbstractPointLocator.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; struct vtkBucketList; class vtkDataArray; @@ -312,4 +313,5 @@ private: void operator=(const vtkStaticPointLocator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStaticPointLocator2D.cxx b/Common/DataModel/vtkStaticPointLocator2D.cxx index afb876f0a4..42db7e15ce 100644 --- a/Common/DataModel/vtkStaticPointLocator2D.cxx +++ b/Common/DataModel/vtkStaticPointLocator2D.cxx @@ -30,6 +30,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStaticPointLocator2D); // There are stack-allocated bucket neighbor lists. This is the initial @@ -2086,3 +2087,4 @@ void vtkStaticPointLocator2D::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Large IDs: " << this->LargeIds << "\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStaticPointLocator2D.h b/Common/DataModel/vtkStaticPointLocator2D.h index 8a797f641e..05b5d8cb15 100644 --- a/Common/DataModel/vtkStaticPointLocator2D.h +++ b/Common/DataModel/vtkStaticPointLocator2D.h @@ -59,6 +59,7 @@ #include "vtkAbstractPointLocator.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; struct vtkBucketList2D; @@ -294,4 +295,5 @@ private: void operator=(const vtkStaticPointLocator2D&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStructuredData.cxx b/Common/DataModel/vtkStructuredData.cxx index f7954a1575..b37b0efab8 100644 --- a/Common/DataModel/vtkStructuredData.cxx +++ b/Common/DataModel/vtkStructuredData.cxx @@ -23,6 +23,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN namespace { // FIXME @@ -769,3 +770,4 @@ void vtkStructuredData::GetCellNeighbors( } } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStructuredData.h b/Common/DataModel/vtkStructuredData.h index 526c3b6e99..8ec8f59728 100644 --- a/Common/DataModel/vtkStructuredData.h +++ b/Common/DataModel/vtkStructuredData.h @@ -32,6 +32,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdList; class vtkUnsignedCharArray; @@ -445,4 +446,5 @@ inline void vtkStructuredData::ComputePointStructuredCoordsForExtent( vtkStructuredData::GetGlobalStructuredCoordinates(lijk, ext, ijk); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStructuredExtent.cxx b/Common/DataModel/vtkStructuredExtent.cxx index 483b4e1b11..c586f5738f 100644 --- a/Common/DataModel/vtkStructuredExtent.cxx +++ b/Common/DataModel/vtkStructuredExtent.cxx @@ -16,6 +16,7 @@ #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStructuredExtent); //------------------------------------------------------------------------------ vtkStructuredExtent::vtkStructuredExtent() = default; @@ -28,3 +29,4 @@ void vtkStructuredExtent::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStructuredExtent.h b/Common/DataModel/vtkStructuredExtent.h index aae1b23755..9ba26301c7 100644 --- a/Common/DataModel/vtkStructuredExtent.h +++ b/Common/DataModel/vtkStructuredExtent.h @@ -29,6 +29,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkStructuredExtent : public vtkObject { public: @@ -177,4 +178,5 @@ inline void vtkStructuredExtent::GetDimensions(const int ext[6], int dims[3]) dims[2] = ext[5] - ext[4] + 1; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStructuredGrid.cxx b/Common/DataModel/vtkStructuredGrid.cxx index 6c7dcc316d..7a680bdc01 100644 --- a/Common/DataModel/vtkStructuredGrid.cxx +++ b/Common/DataModel/vtkStructuredGrid.cxx @@ -29,6 +29,7 @@ #include "vtkUnsignedCharArray.h" #include "vtkVertex.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStructuredGrid); vtkStandardExtendedNewMacro(vtkStructuredGrid); @@ -1339,3 +1340,4 @@ bool vtkStructuredGrid::HasAnyBlankCells() int cellBlanking = this->CellData->HasAnyGhostBitSet(vtkDataSetAttributes::HIDDENCELL); return cellBlanking || this->HasAnyBlankPoints(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStructuredGrid.h b/Common/DataModel/vtkStructuredGrid.h index 6acccc413c..5d9c447d3e 100644 --- a/Common/DataModel/vtkStructuredGrid.h +++ b/Common/DataModel/vtkStructuredGrid.h @@ -48,6 +48,7 @@ #include "vtkStructuredData.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkEmptyCell; class vtkHexahedron; class vtkLine; @@ -310,4 +311,5 @@ inline int vtkStructuredGrid::GetDataDimension() return vtkStructuredData::GetDataDimension(this->DataDescription); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStructuredPoints.cxx b/Common/DataModel/vtkStructuredPoints.cxx index bbacae7207..52f8dc4007 100644 --- a/Common/DataModel/vtkStructuredPoints.cxx +++ b/Common/DataModel/vtkStructuredPoints.cxx @@ -17,6 +17,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStructuredPoints); vtkStructuredPoints::vtkStructuredPoints() = default; @@ -25,3 +26,4 @@ void vtkStructuredPoints::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStructuredPoints.h b/Common/DataModel/vtkStructuredPoints.h index 20df008a2b..655196fe4b 100644 --- a/Common/DataModel/vtkStructuredPoints.h +++ b/Common/DataModel/vtkStructuredPoints.h @@ -32,6 +32,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImageData.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkStructuredPoints : public vtkImageData { public: @@ -53,4 +54,5 @@ private: void operator=(const vtkStructuredPoints&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkStructuredPointsCollection.cxx b/Common/DataModel/vtkStructuredPointsCollection.cxx index a16332d60b..fece23bc55 100644 --- a/Common/DataModel/vtkStructuredPointsCollection.cxx +++ b/Common/DataModel/vtkStructuredPointsCollection.cxx @@ -15,6 +15,7 @@ #include "vtkStructuredPointsCollection.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkStructuredPointsCollection); //------------------------------------------------------------------------------ @@ -22,3 +23,4 @@ void vtkStructuredPointsCollection::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkStructuredPointsCollection.h b/Common/DataModel/vtkStructuredPointsCollection.h index 7d1afd2874..ad8e65e4a3 100644 --- a/Common/DataModel/vtkStructuredPointsCollection.h +++ b/Common/DataModel/vtkStructuredPointsCollection.h @@ -28,6 +28,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkStructuredPoints.h" // Needed for static cast +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkStructuredPointsCollection : public vtkCollection { public: @@ -71,4 +72,5 @@ private: void operator=(const vtkStructuredPointsCollection&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkSuperquadric.cxx b/Common/DataModel/vtkSuperquadric.cxx index 4fe1b79164..f7eae5826a 100644 --- a/Common/DataModel/vtkSuperquadric.cxx +++ b/Common/DataModel/vtkSuperquadric.cxx @@ -24,6 +24,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkSuperquadric); // Construct with superquadric radius of 0.5, toroidal off, center at 0.0, @@ -149,3 +150,4 @@ void vtkSuperquadric::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scale: (" << this->Scale[0] << ", " << this->Scale[1] << ", " << this->Scale[2] << ")\n"; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkSuperquadric.h b/Common/DataModel/vtkSuperquadric.h index 7c43e97fa7..64c4acd278 100644 --- a/Common/DataModel/vtkSuperquadric.h +++ b/Common/DataModel/vtkSuperquadric.h @@ -47,6 +47,7 @@ #define VTK_MIN_SUPERQUADRIC_THICKNESS 1e-4 +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkSuperquadric : public vtkImplicitFunction { public: @@ -141,4 +142,5 @@ private: void operator=(const vtkSuperquadric&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTable.cxx b/Common/DataModel/vtkTable.cxx index 3558dd8036..658de69461 100644 --- a/Common/DataModel/vtkTable.cxx +++ b/Common/DataModel/vtkTable.cxx @@ -37,6 +37,7 @@ // Standard functions // +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkTable); vtkStandardExtendedNewMacro(vtkTable); vtkCxxSetObjectMacro(vtkTable, RowData, vtkDataSetAttributes); @@ -804,3 +805,4 @@ vtkIdType vtkTable::GetNumberOfElements(int type) } return this->Superclass::GetNumberOfElements(type); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTable.h b/Common/DataModel/vtkTable.h index 801ac4e3ae..187499f12d 100644 --- a/Common/DataModel/vtkTable.h +++ b/Common/DataModel/vtkTable.h @@ -59,6 +59,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDataObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkAbstractArray; class vtkDataSetAttributes; class vtkVariant; @@ -316,4 +317,5 @@ private: void operator=(const vtkTable&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTetra.cxx b/Common/DataModel/vtkTetra.cxx index ae2bb834ab..dca31e4ac2 100644 --- a/Common/DataModel/vtkTetra.cxx +++ b/Common/DataModel/vtkTetra.cxx @@ -29,6 +29,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkTetra); //------------------------------------------------------------------------------ @@ -1209,3 +1210,4 @@ void vtkTetra::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Triangle:\n"; this->Triangle->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTetra.h b/Common/DataModel/vtkTetra.h index 9bd4c45f03..0aad695c4e 100644 --- a/Common/DataModel/vtkTetra.h +++ b/Common/DataModel/vtkTetra.h @@ -33,6 +33,7 @@ #include "vtkCell3D.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkTriangle; class vtkUnstructuredGrid; @@ -267,4 +268,5 @@ inline int vtkTetra::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTree.cxx b/Common/DataModel/vtkTree.cxx index 439677892e..90b3bbbfbd 100644 --- a/Common/DataModel/vtkTree.cxx +++ b/Common/DataModel/vtkTree.cxx @@ -28,6 +28,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkTree); //------------------------------------------------------------------------------ vtkTree::vtkTree() @@ -218,3 +219,4 @@ void vtkTree::PrintSelf(ostream& os, vtkIndent indent) this->Superclass::PrintSelf(os, indent); os << indent << "Root: " << this->Root << endl; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTree.h b/Common/DataModel/vtkTree.h index 239729a4cc..645dff6dfc 100644 --- a/Common/DataModel/vtkTree.h +++ b/Common/DataModel/vtkTree.h @@ -49,6 +49,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkDirectedAcyclicGraph.h" +VTK_ABI_NAMESPACE_BEGIN class vtkIdTypeArray; class VTKCOMMONDATAMODEL_EXPORT vtkTree : public vtkDirectedAcyclicGraph @@ -145,4 +146,5 @@ private: void operator=(const vtkTree&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTreeBFSIterator.cxx b/Common/DataModel/vtkTreeBFSIterator.cxx index c0071848c6..af1c8527ab 100644 --- a/Common/DataModel/vtkTreeBFSIterator.cxx +++ b/Common/DataModel/vtkTreeBFSIterator.cxx @@ -22,6 +22,7 @@ #include using std::queue; +VTK_ABI_NAMESPACE_BEGIN class vtkTreeBFSIteratorInternals { public: @@ -114,3 +115,4 @@ vtkIdType vtkTreeBFSIterator::NextInternal() } return -1; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTreeBFSIterator.h b/Common/DataModel/vtkTreeBFSIterator.h index 66ccbf3124..7d988d1a37 100644 --- a/Common/DataModel/vtkTreeBFSIterator.h +++ b/Common/DataModel/vtkTreeBFSIterator.h @@ -34,6 +34,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkTreeIterator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkTreeBFSIteratorInternals; class vtkIntArray; @@ -66,4 +67,5 @@ private: void operator=(const vtkTreeBFSIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTreeDFSIterator.cxx b/Common/DataModel/vtkTreeDFSIterator.cxx index 4047f68855..9c98d6090e 100644 --- a/Common/DataModel/vtkTreeDFSIterator.cxx +++ b/Common/DataModel/vtkTreeDFSIterator.cxx @@ -27,6 +27,7 @@ #include using std::stack; +VTK_ABI_NAMESPACE_BEGIN struct vtkTreeDFSIteratorPosition { vtkTreeDFSIteratorPosition(vtkIdType vertex, vtkIdType index) @@ -197,3 +198,4 @@ vtkIdType vtkTreeDFSIterator::NextInternal() // cout << "DFS no more!" << endl; return -1; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTreeDFSIterator.h b/Common/DataModel/vtkTreeDFSIterator.h index 40e5123e6b..570735ef57 100644 --- a/Common/DataModel/vtkTreeDFSIterator.h +++ b/Common/DataModel/vtkTreeDFSIterator.h @@ -41,6 +41,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkTreeIterator.h" +VTK_ABI_NAMESPACE_BEGIN class vtkTreeDFSIteratorInternals; class vtkIntArray; @@ -94,4 +95,5 @@ private: void operator=(const vtkTreeDFSIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTreeIterator.cxx b/Common/DataModel/vtkTreeIterator.cxx index c069be8da2..80bd01966d 100644 --- a/Common/DataModel/vtkTreeIterator.cxx +++ b/Common/DataModel/vtkTreeIterator.cxx @@ -17,6 +17,7 @@ #include "vtkTree.h" +VTK_ABI_NAMESPACE_BEGIN vtkTreeIterator::vtkTreeIterator() { this->Tree = nullptr; @@ -81,3 +82,4 @@ void vtkTreeIterator::Restart() { this->Initialize(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTreeIterator.h b/Common/DataModel/vtkTreeIterator.h index aaf780ae5c..a1f4e9ed85 100644 --- a/Common/DataModel/vtkTreeIterator.h +++ b/Common/DataModel/vtkTreeIterator.h @@ -34,6 +34,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkObject.h" +VTK_ABI_NAMESPACE_BEGIN class vtkTree; class VTKCOMMONDATAMODEL_EXPORT vtkTreeIterator : public vtkObject @@ -91,4 +92,5 @@ private: void operator=(const vtkTreeIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTriQuadraticHexahedron.cxx b/Common/DataModel/vtkTriQuadraticHexahedron.cxx index 71426aaca1..ac5a97029c 100644 --- a/Common/DataModel/vtkTriQuadraticHexahedron.cxx +++ b/Common/DataModel/vtkTriQuadraticHexahedron.cxx @@ -26,6 +26,7 @@ #include "vtkPoints.h" #include "vtkQuadraticEdge.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkTriQuadraticHexahedron); //------------------------------------------------------------------------------ @@ -742,3 +743,4 @@ void vtkTriQuadraticHexahedron::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTriQuadraticHexahedron.h b/Common/DataModel/vtkTriQuadraticHexahedron.h index f89ddd66c8..676af78b6a 100644 --- a/Common/DataModel/vtkTriQuadraticHexahedron.h +++ b/Common/DataModel/vtkTriQuadraticHexahedron.h @@ -74,6 +74,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkBiQuadraticQuad; class vtkHexahedron; @@ -176,4 +177,5 @@ private: void operator=(const vtkTriQuadraticHexahedron&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTriQuadraticPyramid.cxx b/Common/DataModel/vtkTriQuadraticPyramid.cxx index d9142f6f11..0f66297c50 100644 --- a/Common/DataModel/vtkTriQuadraticPyramid.cxx +++ b/Common/DataModel/vtkTriQuadraticPyramid.cxx @@ -29,6 +29,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN namespace { // defined constants used in interpolation functions and their partial derivatives @@ -1078,3 +1079,4 @@ void vtkTriQuadraticPyramid::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Scalars:\n"; this->Scalars->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTriQuadraticPyramid.h b/Common/DataModel/vtkTriQuadraticPyramid.h index 91ccb91707..e62b28b2a9 100644 --- a/Common/DataModel/vtkTriQuadraticPyramid.h +++ b/Common/DataModel/vtkTriQuadraticPyramid.h @@ -94,6 +94,7 @@ #include "vtkNew.h" // initialize cells that are used for the implementation #include "vtkNonLinearCell.h" +VTK_ABI_NAMESPACE_BEGIN class vtkQuadraticEdge; class vtkBiQuadraticQuad; class vtkBiQuadraticTriangle; @@ -226,4 +227,5 @@ inline int vtkTriQuadraticPyramid::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTriangle.cxx b/Common/DataModel/vtkTriangle.cxx index 9aa06e5e3e..fad03d75d4 100644 --- a/Common/DataModel/vtkTriangle.cxx +++ b/Common/DataModel/vtkTriangle.cxx @@ -30,6 +30,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkTriangle); //------------------------------------------------------------------------------ @@ -1710,3 +1711,4 @@ void vtkTriangle::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Line:\n"; this->Line->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTriangle.h b/Common/DataModel/vtkTriangle.h index 9125fa0873..5d726a5282 100644 --- a/Common/DataModel/vtkTriangle.h +++ b/Common/DataModel/vtkTriangle.h @@ -28,6 +28,7 @@ #include "vtkMath.h" // Needed for inline methods +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkQuadric; class vtkIncrementalPointLocator; @@ -293,4 +294,5 @@ inline double vtkTriangle::TriangleArea(const double p1[3], const double p2[3], return 0.5 * vtkMath::Norm(n); } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkTriangleStrip.cxx b/Common/DataModel/vtkTriangleStrip.cxx index 0d3f5ce893..490d03ed00 100644 --- a/Common/DataModel/vtkTriangleStrip.cxx +++ b/Common/DataModel/vtkTriangleStrip.cxx @@ -22,6 +22,7 @@ #include "vtkPoints.h" #include "vtkTriangle.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkTriangleStrip); //------------------------------------------------------------------------------ @@ -344,3 +345,4 @@ void vtkTriangleStrip::PrintSelf(ostream& os, vtkIndent indent) os << indent << "Triangle:\n"; this->Triangle->PrintSelf(os, indent.GetNextIndent()); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkTriangleStrip.h b/Common/DataModel/vtkTriangleStrip.h index 83a22aa655..673a71611d 100644 --- a/Common/DataModel/vtkTriangleStrip.h +++ b/Common/DataModel/vtkTriangleStrip.h @@ -30,6 +30,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkLine; class vtkTriangle; class vtkIncrementalPointLocator; @@ -93,4 +94,5 @@ private: void operator=(const vtkTriangleStrip&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkUndirectedGraph.cxx b/Common/DataModel/vtkUndirectedGraph.cxx index 313d21feeb..2fade9fe03 100644 --- a/Common/DataModel/vtkUndirectedGraph.cxx +++ b/Common/DataModel/vtkUndirectedGraph.cxx @@ -31,6 +31,7 @@ //------------------------------------------------------------------------------ // class vtkUndirectedGraph //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUndirectedGraph); //------------------------------------------------------------------------------ vtkUndirectedGraph::vtkUndirectedGraph() = default; @@ -130,3 +131,4 @@ void vtkUndirectedGraph::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkUndirectedGraph.h b/Common/DataModel/vtkUndirectedGraph.h index 75bbfe3b1d..ce31575e30 100644 --- a/Common/DataModel/vtkUndirectedGraph.h +++ b/Common/DataModel/vtkUndirectedGraph.h @@ -45,6 +45,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkGraph.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkUndirectedGraph : public vtkGraph { public: @@ -114,4 +115,5 @@ private: void operator=(const vtkUndirectedGraph&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkUniformGrid.cxx b/Common/DataModel/vtkUniformGrid.cxx index ae071584df..010748d34f 100644 --- a/Common/DataModel/vtkUniformGrid.cxx +++ b/Common/DataModel/vtkUniformGrid.cxx @@ -33,6 +33,7 @@ #include "vtkVertex.h" #include "vtkVoxel.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUniformGrid); unsigned char vtkUniformGrid::MASKED_CELL_VALUE = @@ -1083,3 +1084,4 @@ bool vtkUniformGrid::HasAnyBlankCells() int cellBlanking = this->CellData->HasAnyGhostBitSet(vtkDataSetAttributes::HIDDENCELL); return cellBlanking || this->HasAnyBlankPoints(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkUniformGrid.h b/Common/DataModel/vtkUniformGrid.h index 561c6ab0d4..714359bb53 100644 --- a/Common/DataModel/vtkUniformGrid.h +++ b/Common/DataModel/vtkUniformGrid.h @@ -26,6 +26,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkImageData.h" +VTK_ABI_NAMESPACE_BEGIN class vtkEmptyCell; class vtkStructuredVisibilityConstraint; class vtkUnsignedCharArray; @@ -208,4 +209,5 @@ private: static unsigned char MASKED_CELL_VALUE; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkUniformGridAMR.cxx b/Common/DataModel/vtkUniformGridAMR.cxx index b3077d7013..0024977bbc 100644 --- a/Common/DataModel/vtkUniformGridAMR.cxx +++ b/Common/DataModel/vtkUniformGridAMR.cxx @@ -24,6 +24,7 @@ #include "vtkUniformGrid.h" #include "vtkUniformGridAMRDataIterator.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUniformGridAMR); //------------------------------------------------------------------------------ @@ -367,3 +368,4 @@ void vtkUniformGridAMR::GetMax(double max[3]) max[1] = bb[3]; max[2] = bb[5]; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkUniformGridAMR.h b/Common/DataModel/vtkUniformGridAMR.h index ae679ad4c3..2af680d031 100644 --- a/Common/DataModel/vtkUniformGridAMR.h +++ b/Common/DataModel/vtkUniformGridAMR.h @@ -28,6 +28,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkCompositeDataSet.h" +VTK_ABI_NAMESPACE_BEGIN class vtkCompositeDataIterator; class vtkUniformGrid; class vtkAMRInformation; @@ -184,4 +185,5 @@ private: friend class vtkUniformGridAMRDataIterator; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkUniformGridAMRDataIterator.cxx b/Common/DataModel/vtkUniformGridAMRDataIterator.cxx index 8be5d7a69f..c386f15fbf 100644 --- a/Common/DataModel/vtkUniformGridAMRDataIterator.cxx +++ b/Common/DataModel/vtkUniformGridAMRDataIterator.cxx @@ -23,6 +23,7 @@ #include //---------------------------------------------------------------- +VTK_ABI_NAMESPACE_BEGIN class AMRIndexIterator : public vtkObject { public: @@ -216,3 +217,4 @@ int vtkUniformGridAMRDataIterator::IsDoneWithTraversal() { return (!this->Iter) || this->Iter->IsDone(); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkUniformGridAMRDataIterator.h b/Common/DataModel/vtkUniformGridAMRDataIterator.h index 39c83c856c..3ede000c13 100644 --- a/Common/DataModel/vtkUniformGridAMRDataIterator.h +++ b/Common/DataModel/vtkUniformGridAMRDataIterator.h @@ -26,6 +26,7 @@ #include "vtkCompositeDataIterator.h" #include "vtkSmartPointer.h" //for member variable Information +VTK_ABI_NAMESPACE_BEGIN class vtkInformation; class vtkAMRInformation; class vtkAMRDataInternals; @@ -107,4 +108,5 @@ private: void GetCurrentIndexPair(unsigned int& level, unsigned int& id); }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkUniformHyperTreeGrid.cxx b/Common/DataModel/vtkUniformHyperTreeGrid.cxx index caa27f2fcd..c6252b7ea6 100644 --- a/Common/DataModel/vtkUniformHyperTreeGrid.cxx +++ b/Common/DataModel/vtkUniformHyperTreeGrid.cxx @@ -22,6 +22,7 @@ PURPOSE. See the above copyright notice for more information. #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUniformHyperTreeGrid); // Helper macros to quickly fetch a HT at a given index or iterator @@ -461,3 +462,4 @@ unsigned long vtkUniformHyperTreeGrid::GetActualMemorySizeBytes() return size; } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkUniformHyperTreeGrid.h b/Common/DataModel/vtkUniformHyperTreeGrid.h index af8c88bced..cf7005c536 100644 --- a/Common/DataModel/vtkUniformHyperTreeGrid.h +++ b/Common/DataModel/vtkUniformHyperTreeGrid.h @@ -38,6 +38,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkHyperTreeGrid.h" +VTK_ABI_NAMESPACE_BEGIN class vtkDoubleArray; class vtkHyperTreeGridScales; @@ -241,4 +242,5 @@ private: void operator=(const vtkUniformHyperTreeGrid&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkUnstructuredGrid.cxx b/Common/DataModel/vtkUnstructuredGrid.cxx index 5494308567..3c7ac84dfd 100644 --- a/Common/DataModel/vtkUnstructuredGrid.cxx +++ b/Common/DataModel/vtkUnstructuredGrid.cxx @@ -89,6 +89,7 @@ #include #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUnstructuredGrid); vtkStandardExtendedNewMacro(vtkUnstructuredGrid); @@ -2497,3 +2498,4 @@ vtkUnstructuredGrid* vtkUnstructuredGrid::GetData(vtkInformationVector* v, int i { return vtkUnstructuredGrid::GetData(v->GetInformationObject(i)); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkUnstructuredGrid.h b/Common/DataModel/vtkUnstructuredGrid.h index 3537a97e66..093d1d931c 100644 --- a/Common/DataModel/vtkUnstructuredGrid.h +++ b/Common/DataModel/vtkUnstructuredGrid.h @@ -37,6 +37,7 @@ #include "vtkSmartPointer.h" // for smart pointer +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkAbstractCellLinks; class vtkBezierCurve; @@ -657,4 +658,5 @@ private: void Cleanup(); }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkUnstructuredGridBase.cxx b/Common/DataModel/vtkUnstructuredGridBase.cxx index 6e50c0c8a3..b5191f092a 100644 --- a/Common/DataModel/vtkUnstructuredGridBase.cxx +++ b/Common/DataModel/vtkUnstructuredGridBase.cxx @@ -20,6 +20,7 @@ #include "vtkSmartPointer.h" //------------------------------------------------------------------------------ +VTK_ABI_NAMESPACE_BEGIN vtkUnstructuredGridBase::vtkUnstructuredGridBase() = default; //------------------------------------------------------------------------------ @@ -79,3 +80,4 @@ void vtkUnstructuredGridBase::ReplaceCell(vtkIdType cellId, int npts, const vtkI { this->InternalReplaceCell(cellId, npts, pts); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkUnstructuredGridBase.h b/Common/DataModel/vtkUnstructuredGridBase.h index 0a884ccf1f..2bb3a556a2 100644 --- a/Common/DataModel/vtkUnstructuredGridBase.h +++ b/Common/DataModel/vtkUnstructuredGridBase.h @@ -31,6 +31,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkPointSet.h" +VTK_ABI_NAMESPACE_BEGIN class VTKCOMMONDATAMODEL_EXPORT vtkUnstructuredGridBase : public vtkPointSet { public: @@ -129,4 +130,5 @@ private: void operator=(const vtkUnstructuredGridBase&) = delete; }; +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkUnstructuredGridCellIterator.cxx b/Common/DataModel/vtkUnstructuredGridCellIterator.cxx index 78c0e9cf19..a4f31df80a 100644 --- a/Common/DataModel/vtkUnstructuredGridCellIterator.cxx +++ b/Common/DataModel/vtkUnstructuredGridCellIterator.cxx @@ -26,6 +26,7 @@ #include +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkUnstructuredGridCellIterator); //------------------------------------------------------------------------------ @@ -196,3 +197,4 @@ void vtkUnstructuredGridCellIterator::FetchFaces() this->Faces->SetNumberOfIds(0); } } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkUnstructuredGridCellIterator.h b/Common/DataModel/vtkUnstructuredGridCellIterator.h index 8aa120239a..8dbdd4cb0c 100644 --- a/Common/DataModel/vtkUnstructuredGridCellIterator.h +++ b/Common/DataModel/vtkUnstructuredGridCellIterator.h @@ -26,6 +26,7 @@ #include "vtkCommonDataModelModule.h" // For export macro #include "vtkSmartPointer.h" // For vtkSmartPointer +VTK_ABI_NAMESPACE_BEGIN class vtkCellArray; class vtkIdTypeArray; class vtkUnsignedCharArray; @@ -85,4 +86,5 @@ private: void operator=(const vtkUnstructuredGridCellIterator&) = delete; }; +VTK_ABI_NAMESPACE_END #endif // vtkUnstructuredGridCellIterator_h diff --git a/Common/DataModel/vtkVector.h b/Common/DataModel/vtkVector.h index 0cdc231a1c..ef3ef5cf3b 100644 --- a/Common/DataModel/vtkVector.h +++ b/Common/DataModel/vtkVector.h @@ -33,6 +33,7 @@ #include // For math functions +VTK_ABI_NAMESPACE_BEGIN template class vtkVector : public vtkTuple { @@ -519,5 +520,6 @@ public: vtkVectorDerivedMacro(vtkVector4d, double, 4); }; +VTK_ABI_NAMESPACE_END #endif // vtkVector_h // VTK-HeaderTest-Exclude: vtkVector.h diff --git a/Common/DataModel/vtkVectorOperators.h b/Common/DataModel/vtkVectorOperators.h index 9755233814..92c36b7f21 100644 --- a/Common/DataModel/vtkVectorOperators.h +++ b/Common/DataModel/vtkVectorOperators.h @@ -22,6 +22,7 @@ // Description: // Unary minus / negation of vector. +VTK_ABI_NAMESPACE_BEGIN template vtkVector operator-(const vtkVector& v) { @@ -190,5 +191,6 @@ vtkVectorOperatorMacro(vtkVector3i, int, 3); vtkVectorOperatorMacro(vtkVector3f, float, 3); vtkVectorOperatorMacro(vtkVector3d, double, 3); +VTK_ABI_NAMESPACE_END #endif // VTK-HeaderTest-Exclude: vtkVectorOperators.h diff --git a/Common/DataModel/vtkVertex.cxx b/Common/DataModel/vtkVertex.cxx index 0d61c6013f..2066a9a5f2 100644 --- a/Common/DataModel/vtkVertex.cxx +++ b/Common/DataModel/vtkVertex.cxx @@ -22,6 +22,7 @@ #include "vtkPointData.h" #include "vtkPoints.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkVertex); //------------------------------------------------------------------------------ @@ -260,3 +261,4 @@ void vtkVertex::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } +VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkVertex.h b/Common/DataModel/vtkVertex.h index d2980d907e..54db1198c5 100644 --- a/Common/DataModel/vtkVertex.h +++ b/Common/DataModel/vtkVertex.h @@ -25,6 +25,7 @@ #include "vtkCell.h" #include "vtkCommonDataModelModule.h" // For export macro +VTK_ABI_NAMESPACE_BEGIN class vtkIncrementalPointLocator; class VTKCOMMONDATAMODEL_EXPORT vtkVertex : public vtkCell @@ -142,4 +143,5 @@ inline int vtkVertex::GetParametricCenter(double pcoords[3]) return 0; } +VTK_ABI_NAMESPACE_END #endif diff --git a/Common/DataModel/vtkVertexListIterator.cxx b/Common/DataModel/vtkVertexListIterator.cxx index 9bed98725c..9c46848c30 100644 --- a/Common/DataModel/vtkVertexListIterator.cxx +++ b/Common/DataModel/vtkVertexListIterator.cxx @@ -26,6 +26,7 @@ #include "vtkInformation.h" #include "vtkObjectFactory.h" +VTK_ABI_NAMESPACE_BEGIN vtkStandardNewMacro(vtkVertexListIterator); //------------------------------------------------------------------------------ vtkVertexListIterator::vtkVertexListIterator() @@ -75,3 +76,4 @@ void vtkVertexListIterator::PrintSelf(ostream& os, vtkIndent indent) this->Graph-