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/Comm