diff --git a/Common/DataModel/vtkCellMetadata.cxx b/Common/DataModel/vtkCellMetadata.cxx index 03aa796e77b509c4cb2e0383a49e67a27c762a72..5146cc2dbef863199b97a2becf5524b26bc424a6 100644 --- a/Common/DataModel/vtkCellMetadata.cxx +++ b/Common/DataModel/vtkCellMetadata.cxx @@ -5,8 +5,6 @@ #include "vtkCellGrid.h" #include "vtkDebugLeaks.h" -#include <token/Singletons.h> - VTK_ABI_NAMESPACE_BEGIN using namespace vtk::literals; diff --git a/Common/DataModel/vtkCellMetadata.h b/Common/DataModel/vtkCellMetadata.h index 0f446fc8a0c4a63253cb1ed685a95e9700e9e3c6..b17dfeffad37a3b59458e8aa18859296e252bd38 100644 --- a/Common/DataModel/vtkCellMetadata.h +++ b/Common/DataModel/vtkCellMetadata.h @@ -30,6 +30,8 @@ #include "vtkStringToken.h" // for vtkStringToken::Hash #include "vtkTypeName.h" // for vtk::TypeName<>() +#include <token/Singletons.h> // Increment Schwarz counter for initialization. + #include <functional> #include <set> #include <unordered_map> diff --git a/Common/ExecutionModel/vtkFilteringInformationKeyManager.h b/Common/ExecutionModel/vtkFilteringInformationKeyManager.h index 1fcc3e078ce8e735137dd0bc040e35edc1a3d9bd..de1b6a20f602fcabf58db5eb3bb68f3f3f45d3e5 100644 --- a/Common/ExecutionModel/vtkFilteringInformationKeyManager.h +++ b/Common/ExecutionModel/vtkFilteringInformationKeyManager.h @@ -18,6 +18,8 @@ #include "vtkDebugLeaksManager.h" // DebugLeaks exists longer than info keys. +#include <token/Singletons.h> // to increment its Schwarz counter + #include <functional> // for finalizers #include <vector> // for finalizers diff --git a/Documentation/release/dev/cell-grid-initialization.md b/Documentation/release/dev/cell-grid-initialization.md new file mode 100644 index 0000000000000000000000000000000000000000..f9bc1690cb121a2bebbfb8fcc72c9976e4239c5d --- /dev/null +++ b/Documentation/release/dev/cell-grid-initialization.md @@ -0,0 +1,7 @@ +# Fix cell-grid initialization + +Static debug builds on Windows could crash at initialization as +the Schwarz counter to prepare the singleton container used to +register cell-grid cell metadata subclasses was not incremented +in time. See [#19552](https://gitlab.kitware.com/vtk/vtk/-/issues/19552) +for more information.