Skip to content

Conversation

@hjmjohnson
Copy link
Contributor

When preparing for the future with ITK by setting
ITK_FUTURE_LEGACY_REMOVE:BOOL=ON
ITK_LEGACY_REMOVEBOOL=ON

The future preferred macro should be used
│ - itkTypeMacro
│ + itkOverrideGetNameOfClassMacro

@hjmjohnson
Copy link
Contributor Author

@dzenanz This is part of an effort to create a v5.4.2.1 release that allows Slicer to build with ITK_LEGACY_REMOVE and ITK_FUTURE_LEGACY_REMOVE turned on.

It is an intermediate refactoring that is upstream compatible but allows Slicer to catch up more slowly.

@hjmjohnson
Copy link
Contributor Author

@dzenanz Part of the future updates needed to build Slicer with future code recommendationsl

@hjmjohnson hjmjohnson force-pushed the fix-legacy-remove branch 2 times, most recently from 53b8a4f to 9fdec0a Compare January 28, 2025 03:00
@dzenanz
Copy link
Member

dzenanz commented Jan 28, 2025

This sounds like WASM part needs to be updated to use a newer base image:

In file included from /work/wasm/morphological-contour-interpolation.cxx:24:
/work/include/itkMorphologicalContourInterpolator.h:83:3: error: unknown type name 'itkOverrideGetNameOfClassMacro'
   83 |   itkOverrideGetNameOfClassMacro(MorphologicalContourInterpolator);
      |   ^
1 error generated.

@dzenanz dzenanz requested a review from thewtex January 28, 2025 16:31
@thewtex
Copy link
Collaborator

thewtex commented Jan 28, 2025

Is itkOverrideGetNameOfClassMacro in the release-5.4 branch?

@dzenanz
Copy link
Member

dzenanz commented Jan 28, 2025

Yes, it was added in Dec 2023.

@dzenanz
Copy link
Member

dzenanz commented Jan 28, 2025

It is there already in v5.4.0:
https://github.com/InsightSoftwareConsortium/ITK/blob/v5.4.0/Modules/Core/Common/include/itkMacro.h#L463

@thewtex
Copy link
Collaborator

thewtex commented Jan 30, 2025

I will rebase, follow-up.

@dzenanz
Copy link
Member

dzenanz commented Feb 22, 2025

Can you rebase this Hans?

When preparing for the future with ITK by setting
ITK_FUTURE_LEGACY_REMOVE:BOOL=ON
ITK_LEGACY_REMOVEBOOL=ON

The future preferred macro should be used
│ -  itkTypeMacro
│ +  itkOverrideGetNameOfClassMacro
Update source to match newer ITK style guidelines.
@hjmjohnson
Copy link
Contributor Author

@dzenanz Rebased.

@dzenanz
Copy link
Member

dzenanz commented Mar 14, 2025

Matt, would changes from InsightSoftwareConsortium/ITKMeshToPolyData#77 work here?

@thewtex
Copy link
Collaborator

thewtex commented Mar 14, 2025

Wasm updates for ITK 5.4.2 are here: #130

@dzenanz dzenanz merged commit 821bf9b into KitwareMedical:main Mar 14, 2025
39 of 45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants