COMP: Add missing semicolons after ITK macros for ITK6 compat#3
Open
hjmjohnson wants to merge 1 commit into
Open
COMP: Add missing semicolons after ITK macros for ITK6 compat#3hjmjohnson wants to merge 1 commit into
hjmjohnson wants to merge 1 commit into
Conversation
ITK upstream main (v6 prep) wraps macros like itkSetMacro/itkGetMacro/ itkTypeMacro/itkNewMacro with ITK_MACROEND_NOOP_STATEMENT, which requires the user's `;` at the call site. ITK 5.x's macros self-terminated, so the missing `;` was tolerated. Adding `;` is backward-compatible. Without this fix, building against ITK upstream main produces: error: expected ';' before 'const' error: expected ';' before 'typedef' error: expected ';' before 'virtual'
Author
|
@acsenrafilho This minor code change makes the code compatible with ITKv6 and is backward compatible with all ITKv5 and ITKv4 versions. Please merge if you agree with the changes. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds missing
;afteritkNewMacro,itkTypeMacro,itkSetMacro,itkGetMacrocalls inIADImageFilter/itkIsotropicAnomalousDiffusionImageFilter.hso the extension builds against ITK upstream main (v6 prep).Why this is needed
ITK upstream main wraps these macros with
ITK_MACROEND_NOOP_STATEMENT, which requires the call site to terminate with;. ITK ≤ 5.x's macros self-terminated, so the missing;was tolerated. Adding;is fully backward compatible with ITK 5.x.Without this fix, building against ITK upstream main produces:
Tracking
Part of the Slicer ITK upstream-main (v6) transition tracked at
Slicer/Slicer#9149.
This extension is one of 4 ITK6 regressions whose root cause is missing
;after ITK macros, surfaced by a dual-target ITK 5.4.6 / ITK main extension dashboard.