Update to new macros#15

hjmjohnson merged 2 commits intomainInsightSoftwareConsortium/ITKFPFH:mainfrom

update-to-new-macrosInsightSoftwareConsortium/ITKFPFH:update-to-new-macrosCopy head branch name to clipboard