single_install_dir : "yes"
}
}
+__overwrite__ :
+[
+ {
+ #
+ __condition__ : "VARS.dist in ['CO7']"
+ 'PRODUCTS.CONFIGURATION.default.patches' : ['paraview-5.9_CONFIGURATION.patch']
+ 'PRODUCTS.GUI.default.patches' : ['paraview-5.9_GUI.patch']
+ 'PRODUCTS.PARAVIS.default.patches' : ['paraview-5.9_PARAVIS.patch']
+ 'PRODUCTS.PARAVISADDONS.default.patches' : ['paraview-5.9_PARAVISADDONS.patch']
+ }
+]
---- ParaView_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-12 16:35:40.957930618 +0100
-+++ ParaView/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-12 16:35:50.500219714 +0100
+diff -Naur ParaView-5.9.0_ref/CMakeLists.txt ParaView-5.9.0/CMakeLists.txt
+--- ParaView-5.9.0_ref/CMakeLists.txt 2021-02-04 15:22:04.000000000 +0100
++++ ParaView-5.9.0/CMakeLists.txt 2021-03-01 15:48:43.101402815 +0100
+@@ -831,7 +831,7 @@
+ # Test to check that we can process all of the Catalyst editions
+ #------------------------------------------------------------------------------
+ if (BUILD_TESTING AND PARAVIEW_USE_PYTHON AND UNIX AND NOT APPLE)
+-if (FALSE) # XXX(FIXME)
++if (TRUE) # XXX(FIXME)
+ # disabling till we Catalyst editions are fixed post modularization
+ add_test( NAME GenerateCatalystEditions
+ COMMAND ${CMAKE_COMMAND}
+
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-03-01 15:51:58.110940810 +0100
+@@ -1,6 +1,6 @@
+ # Catalyst Package config file.
+ cmake_policy(PUSH)
+-cmake_policy(VERSION 3.13)
++cmake_policy(VERSION 3.12)
+
+ set(CATALYST_VERSION "@CATALYST_VERSION@")
+ set(CATALYST_ABI_VERSION "@CATALYST_ABI_VERSION@")
+
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-03-01 15:56:02.640910857 +0100
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13...3.16 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12...3.16 FATAL_ERROR)
--- /dev/null
+diff --git a/cmake/FindSalomeTBB.cmake b/cmake/FindSalomeTBB.cmake
+index 6e41f63..e5aa8d5 100644
+--- a/cmake/FindSalomeTBB.cmake
++++ b/cmake/FindSalomeTBB.cmake
+@@ -20,9 +20,10 @@
+ IF(NOT DEFINED MACHINE_IS_64)
+ MESSAGE(FATAL_ERROR "Developer error -> SalomeSetupPlatform macros should be inclided before find_package(SalomeTBB) !")
+ ENDIF()
+-
+-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(TBB TBB_INCLUDE_DIRS 1)
+-
++Find_package(TBB)
++#SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(TBB TBB_INCLUDE_DIRS 1)
++MESSAGE(WARNING "TBB_INCLUDE_DIRS = ${TBB_INCLUDE_DIRS}")
++MESSAGE(WARNING "TBB_LIBRARIES = ${TBB_LIBRARIES}")
+ IF(TBB_INCLUDE_DIRS AND TBB_LIBRARIES)
+ # No config mode
+ MARK_AS_ADVANCED(TBB_INCLUDE_DIRS TBB_LIBRARIES)
+@@ -57,4 +58,4 @@ IF(TBB_FOUND)
+ SALOME_ACCUMULATE_HEADERS(_tbb_inc)
+ SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${_tbb_lib})
+ ENDIF()
+-ENDIF()
+\ No newline at end of file
++ENDIF()
--- /dev/null
+diff --git a/src/GraphicsView/GraphicsView_ViewFrame.cxx b/src/GraphicsView/GraphicsView_ViewFrame.cxx
+index f075f23..1ba3cb7 100644
+--- a/src/GraphicsView/GraphicsView_ViewFrame.cxx
++++ b/src/GraphicsView/GraphicsView_ViewFrame.cxx
+@@ -42,7 +42,7 @@
+ #include <QMouseEvent>
+ #include <QString>
+ #include <QWheelEvent>
+-
++#include <QPainterPath>
+ //=======================================================================
+ // Name : GraphicsView_ViewFrame
+ // Purpose : Constructor
+diff --git a/src/GraphicsView/GraphicsView_ViewFrame.h b/src/GraphicsView/GraphicsView_ViewFrame.h
+index a8507d3..ffa7c35 100644
+--- a/src/GraphicsView/GraphicsView_ViewFrame.h
++++ b/src/GraphicsView/GraphicsView_ViewFrame.h
+@@ -29,7 +29,7 @@ class QGraphicsSceneMouseEvent;
+ class QGraphicsSceneWheelEvent;
+
+ class QAction;
+-
++class QPainterPath;
+ class SUIT_Desktop;
+
+ class GraphicsView_Viewer;
+diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
+index 384d362..5d9d4f5 100644
+--- a/src/PVViewer/PVViewer_GUIElements.cxx
++++ b/src/PVViewer/PVViewer_GUIElements.cxx
+@@ -143,7 +143,9 @@ void PVViewer_GUIElements::buildPVWidgets()
+ // Catalyst Menu
+ if (!catalystMenu) {
+ catalystMenu = new QMenu(0);
+-#if PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR>=6
++#if PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR>=9
++ pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);
++#elif PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR>=6
+ pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu, myDesktop);
+ #else
+ pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);
+diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+index bc30e34..05dff3e 100644
+--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
++++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+@@ -130,9 +130,9 @@ class QtxAction : QWidgetAction
+
+ %ConvertToSubClassCode
+ if ( qobject_cast<QtxAction*>( sipCpp ) )
+- sipClass = sipClass_QtxAction;
++ sipType = sipType_QtxAction;
+ else
+- sipClass = NULL;
++ sipType = NULL;
+ %End
+
+ public:
+@@ -153,9 +153,9 @@ class QtxActionSet : QtxAction
+
+ %ConvertToSubClassCode
+ if ( qobject_cast<QtxActionSet*>( sipCpp ) )
+- sipClass = sipClass_QtxActionSet;
++ sipType = sipType_QtxActionSet;
+ else
+- sipClass = NULL;
++ sipType = NULL;
+ %End
+
+ public:
+@@ -192,9 +192,9 @@ class QtxActionGroup : QtxActionSet
+
+ %ConvertToSubClassCode
+ if ( qobject_cast<QtxActionGroup*>( sipCpp ) )
+- sipClass = sipClass_QtxActionGroup;
++ sipType = sipType_QtxActionGroup;
+ else
+- sipClass = NULL;
++ sipType = NULL;
+ %End
+
+ public:
+@@ -226,9 +226,9 @@ class QtxTreeView : public QTreeView
+
+ %ConvertToSubClassCode
+ if ( qobject_cast<QtxTreeView*>( sipCpp ) )
+- sipClass = sipClass_QtxTreeView;
++ sipType = sipType_QtxTreeView;
+ else
+- sipClass = NULL;
++ sipType = NULL;
+ %End
+
+ public:
+@@ -252,9 +252,9 @@ class UserDefinedContent : public QWidget
+
+ %ConvertToSubClassCode
+ if ( qobject_cast<UserDefinedContent*>( sipCpp ) )
+- sipClass = sipClass_UserDefinedContent;
++ sipType = sipType_UserDefinedContent;
+ else
+- sipClass = NULL;
++ sipType = NULL;
+ %End
+
+ public:
+diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
+index 66e2af5..eb0962e 100644
+--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
++++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
+@@ -55,9 +55,9 @@ class Plot2d_Curve
+
+ %ConvertToSubClassCode
+ if ( dynamic_cast<Plot2d_Curve*>( sipCpp ) )
+- sipClass = sipClass_Plot2d_Curve;
++ sipType = sipType_Plot2d_Curve;
+ else
+- sipClass = NULL;
++ sipType = NULL;
+ %End
+
+ public:
--- /dev/null
+diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
+index a773a0e..b6f31da 100644
+--- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
++++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
+@@ -70,6 +70,7 @@
+ #include <Basics_Utils.hxx>
+ #include <utilities.h>
+
++#include <fstream>
+ #include <algorithm>
+
+ #define castToNode(n) static_cast<const SMDS_MeshNode *>( n );
+@@ -815,7 +816,7 @@ static bool readGMFFile(MG_HYBRID_API* MGOutput,
+ std::map<int, std::set<int> >::const_iterator subdomainIt = subdomainId2tetraId.begin();
+ std::string aSubdomainFileName = theFile;
+ aSubdomainFileName = aSubdomainFileName + ".subdomain";
+- ofstream aSubdomainFile ( aSubdomainFileName , ios::out);
++ std::ofstream aSubdomainFile ( aSubdomainFileName , ios::out);
+
+ aSubdomainFile << "Nb subdomains " << subdomainId2tetraId.size() << std::endl;
+ for(;subdomainIt != subdomainId2tetraId.end() ; ++subdomainIt) {
+@@ -1489,7 +1490,7 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh,
+ // Write aSmdsToHybridIdMap to temp file
+ std::string aSmdsToHybridIdMapFileName;
+ aSmdsToHybridIdMapFileName = aGenericName + ".ids"; // ids relation
+- ofstream aIdsFile ( aSmdsToHybridIdMapFileName , ios::out);
++ std::ofstream aIdsFile ( aSmdsToHybridIdMapFileName , ios::out);
+ Ok = aIdsFile.rdbuf()->is_open();
+ if (!Ok) {
+ INFOS( "Can't write into " << aSmdsToHybridIdMapFileName);
--- /dev/null
+diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
+index 08fc02d..a472ce0 100644
+--- a/src/PVGUI/PVGUI_Module.cxx
++++ b/src/PVGUI/PVGUI_Module.cxx
+@@ -798,7 +798,7 @@ QString PVGUI_Module::getTraceString()
+
+ vtkSMTrace* tracer = vtkSMTrace::GetActiveTracer();
+ if ( tracer ) {
+- traceString = tracer->GetCurrentTrace();
++ traceString = tracer->GetCurrentTrace().c_str();
+ // 'import pvsimple' is necessary to fix the first call to DisableFirstRenderCamera in the paraview trace
+ // 'ShowParaviewView()' ensure there is an opened viewing window (otherwise SEGFAULT!)
+ traceString = "import pvsimple" + end_line +
+diff --git a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx
+index ff72f76..082b322 100644
+--- a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx
++++ b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx
+@@ -34,7 +34,7 @@
+
+ #include <stdexcept>
+ #include <sstream>
+-
++#include <fstream>
+ // Key words
+ #define MD "_metadata"
+ #define CMT "_comment"
+@@ -183,7 +183,7 @@ int vtkJSONReader::CanParseFile(const char *fname, Json::Value &root)
+ return 0;
+ }
+
+- ifstream file;
++ std::ifstream file;
+ std::ostringstream oss;
+ bool parsedSuccess = true;
+ Json::Reader reader;
+diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
+index 61edea6..6b1857b 100644
+--- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
++++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
+@@ -43,7 +43,7 @@
+ #include "vtkInformationQuadratureSchemeDefinitionVectorKey.h"
+ #include "vtkInformationIntegerKey.h"
+ #include "vtkInformation.h"
+-#include "vtkDataArrayTemplate.h"
++#include "vtkAOSDataArrayTemplate.h"
+ #include "vtkIdTypeArray.h"
+ #include "vtkDoubleArray.h"
+ #include "vtkIntArray.h"
+@@ -118,7 +118,7 @@ vtkIdTypeArray *ELGACmp::isExisting(const std::vector<std::string>& locsReallyUs
+ template<class T>
+ vtkIdTypeArray *ELGACmp::createNew(const MEDCoupling::MEDFileFieldGlobsReal *globs, const std::vector<std::string>& locsReallyUsed, vtkDataArray *vtkd, vtkDataSet *ds, ExportedTinyInfo *internalInfo) const
+ {
+- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<T>::VTK_DATA_ARRAY_DELETE;
++ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<T>::VTK_DATA_ARRAY_DELETE;
+ std::vector< std::vector<std::string> > locNames(_loc_names);
+ std::vector<vtkIdTypeArray *> elgas(_elgas);
+ std::vector< std::pair< vtkQuadratureSchemeDefinition *, unsigned char > > defs;
+@@ -263,9 +263,9 @@ template<class T>
+ void AssignDataPointerToVTK(typename MEDFileVTKTraits<T>::VtkType *vtkTab, typename MEDFileVTKTraits<T>::MCType *mcTab, bool noCpyNumNodes)
+ {
+ if(noCpyNumNodes)
+- vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),1,vtkDataArrayTemplate<T>::VTK_DATA_ARRAY_FREE);
++ vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),1,vtkAOSDataArrayTemplate<T>::VTK_DATA_ARRAY_FREE);
+ else
+- { vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),0,vtkDataArrayTemplate<T>::VTK_DATA_ARRAY_FREE); mcTab->accessToMemArray().setSpecificDeallocator(0); }
++ { vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),0,vtkAOSDataArrayTemplate<T>::VTK_DATA_ARRAY_FREE); mcTab->accessToMemArray().setSpecificDeallocator(0); }
+ }
+
+ // here copy is always assumed.
+@@ -291,7 +291,7 @@ void AssignToFieldData(DataArray *vPtr, const MEDTimeReq *tr, vtkFieldData *att,
+ const std::vector<TypeOfField>& discs, const ELGACmp& elgaCmp, const MEDCoupling::MEDFileFieldGlobsReal *globs,
+ MEDFileAnyTypeField1TS *f1ts, vtkDataSet *ds, ExportedTinyInfo *internalInfo)
+ {
+- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<T>::VTK_DATA_ARRAY_DELETE;
++ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<T>::VTK_DATA_ARRAY_DELETE;
+ typename MEDFileVTKTraits<T>::MCType *vi(static_cast<typename MEDFileVTKTraits<T>::MCType *>(vPtr));
+ typename MEDFileVTKTraits<T>::VtkType *vtkd(MEDFileVTKTraits<T>::VtkType::New());
+ vtkd->SetNumberOfComponents((int)vi->getNumberOfComponents());
+diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx
+index 56cc316..53f2f4c 100644
+--- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx
++++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx
+@@ -19,7 +19,7 @@
+ // Author : Anthony Geay
+
+ #include "vtkGenerateVectors.h"
+-#include "vtkDataArrayTemplate.h"
++#include "vtkAOSDataArrayTemplate.h"
+ #include "vtkDoubleArray.h"
+ #include "vtkInformation.h"
+ #include "vtkUnstructuredGrid.h"
+@@ -83,7 +83,7 @@ void vtkGenerateVectors::Operate(vtkFieldData *fd)
+
+ vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr)
+ {
+- const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_FREE;
++ const int VTK_DATA_ARRAY_FREE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_FREE;
+ vtkDoubleArray *ret(vtkDoubleArray::New());
+ vtkIdType nbOfTuples(oldArr->GetNumberOfTuples());
+ const double *inPt(oldArr->GetPointer(0));
+@@ -106,7 +106,7 @@ vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr)
+
+ vtkDoubleArray *vtkGenerateVectors::OperateMoreThan3Compo(vtkDoubleArray *oldArr)
+ {
+- const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_FREE;
++ const int VTK_DATA_ARRAY_FREE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_FREE;
+ vtkDoubleArray *ret(vtkDoubleArray::New());
+ int nbOfCompo(oldArr->GetNumberOfComponents());
+ vtkIdType nbOfTuples(oldArr->GetNumberOfTuples());
+diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx
+index bb3fc7c..03a0b8b 100644
+--- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx
++++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx
+@@ -23,7 +23,7 @@
+ #include "MEDFileFieldOverView.hxx"
+
+ #include "vtkAdjacentVertexIterator.h"
+-#include "vtkDataArrayTemplate.h"
++#include "vtkAOSDataArrayTemplate.h"
+ #include "vtkIntArray.h"
+ #include "vtkCellData.h"
+ #include "vtkPointData.h"
+@@ -371,7 +371,7 @@ int vtkExtractCellType::RequestInformation(vtkInformation * /*request*/, vtkInfo
+
+ vtkDataSet *FilterFamilies(vtkDataSet *input, const std::vector<int>& idsToKeep, bool insideOut)
+ {
+- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
++ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
+ const char ZE_SELECTION_ARR_NAME[]="@@ZeSelection@@";
+ vtkDataSet *output(input->NewInstance());
+ output->ShallowCopy(input);
+diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
+index 5996b95..40a76ea 100644
+--- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
++++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
+@@ -25,7 +25,7 @@
+ #include "VTKMEDTraits.hxx"
+
+ #include "vtkAdjacentVertexIterator.h"
+-#include "vtkDataArrayTemplate.h"
++#include "vtkAOSDataArrayTemplate.h"
+ #include "vtkIntArray.h"
+ #include "vtkLongArray.h"
+ #ifdef WIN32
+@@ -135,7 +135,7 @@ vtkDataSet *FilterFamilies(vtkSmartPointer<vtkThreshold>& thres,
+ vtkDataSet *input, const std::set<int>& idsToKeep, bool insideOut, const char *arrNameOfFamilyField,
+ const char *associationForThreshold, bool& catchAll, bool& catchSmth)
+ {
+- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
++ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
+ const char ZE_SELECTION_ARR_NAME[]="@@ZeSelection@@";
+ vtkDataSet *output(input->NewInstance());
+ output->ShallowCopy(input);
+diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h
+index 47429cd..13cb054 100644
+--- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h
++++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h
+@@ -26,7 +26,7 @@ class VTK_EXPORT vtkInformationGaussDoubleVectorKey : public vtkInformationDoubl
+ {
+ public:
+ vtkTypeMacro(vtkInformationGaussDoubleVectorKey, vtkInformationDoubleVectorKey)
+- void PrintSelf(ostream& /*os*/, vtkIndent /*indent*/) VTK_OVERRIDE{}
++ void PrintSelf(ostream& /*os*/, vtkIndent /*indent*/) override {};
+
+ vtkInformationGaussDoubleVectorKey(const char* name, const char* location,
+ int length = -1) : vtkInformationDoubleVectorKey(name, location, length) { }
+@@ -48,7 +48,7 @@ public:
+ */
+ void CopyDefaultInformation(vtkInformation* /*request*/,
+ vtkInformation* fromInfo,
+- vtkInformation* toInfo) VTK_OVERRIDE
++ vtkInformation* toInfo) override
+ {
+ this->ShallowCopy(fromInfo, toInfo);
+ }
--- /dev/null
+diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
+index dfe3af6..8107cb6 100644
+--- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
++++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
+@@ -26,7 +26,7 @@
+ #include "VTKMEDTraits.hxx"
+
+ #include "vtkAdjacentVertexIterator.h"
+-#include "vtkDataArrayTemplate.h"
++#include "vtkAOSDataArrayTemplate.h"
+ #include "vtkIntArray.h"
+ #include "vtkLongArray.h"
+ #ifdef WIN32
+@@ -210,7 +210,7 @@ vtkDataSet *FilterFamilies(vtkThreshold *thres,
+ vtkDataSet *input, const std::set<int>& idsToKeep, bool insideOut, const char *arrNameOfFamilyField,
+ const char *associationForThreshold, bool& catchAll, bool& catchSmth)
+ {
+- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
++ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
+ const char ZE_SELECTION_ARR_NAME[]="@@ZeSelection@@";
+ vtkDataSet *output(input->NewInstance());
+ output->ShallowCopy(input);
+diff --git a/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx b/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
+index 208c6f3..5043cbc 100644
+--- a/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
++++ b/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
+@@ -30,7 +30,7 @@
+ #include <vtkCellData.h>
+ #include <vtkCharArray.h>
+ #include <vtkDataArraySelection.h>
+-#include <vtkDataArrayTemplate.h>
++#include <vtkAOSDataArrayTemplate.h>
+ #include <vtkDataObjectTreeIterator.h>
+ #include <vtkDataSet.h>
+ #include <vtkDataSetAttributes.h>
+@@ -156,7 +156,7 @@ int vtkExtractThreeD::RequestInformation(vtkInformation *request, vtkInformation
+
+ vtkDataSet *FilterFamilies(vtkDataSet *input, const std::vector<int> &idsToKeep)
+ {
+- const int VTK_DATA_ARRAY_DELETE = vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
++ const int VTK_DATA_ARRAY_DELETE = vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
+ const char ZE_SELECTION_ARR_NAME[] = "@@ZeSelection@@";
+ vtkDataSet *output(input->NewInstance());
+ output->ShallowCopy(input);
+diff --git a/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx b/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
+index 803049e..e257e58 100644
+--- a/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
++++ b/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
+@@ -29,7 +29,7 @@
+ #include <vtkCharArray.h>
+ #include <vtkCompositeDataToUnstructuredGridFilter.h>
+ #include <vtkDataArraySelection.h>
+-#include <vtkDataArrayTemplate.h>
++#include <vtkAOSDataArrayTemplate.h>
+ #include <vtkDataObjectTreeIterator.h>
+ #include <vtkDataSet.h>
+ #include <vtkDataSetAttributes.h>
+@@ -363,7 +363,7 @@ vtkDataSet* FilterFamilies(vtkZJFilter* zeBoss, vtkDataSet* input, const std::se
+ bool catchAll, catchSmth;
+ vtkNew<vtkThreshold> thres;
+ thres->AddObserver(vtkCommand::ProgressEvent, zeBoss->InternalProgressObserver);
+- constexpr int VTK_DATA_ARRAY_DELETE = vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
++ constexpr int VTK_DATA_ARRAY_DELETE = vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
+ constexpr char ZE_SELECTION_ARR_NAME[] = "@@ZeSelection@@";
+ constexpr char arrNameOfFamilyField[] = "FamilyIdCell";
+ constexpr char associationForThreshold[] = "vtkDataObject::FIELD_ASSOCIATION_CELLS";
