Index: Code/Common/itkMacro.h =================================================================== RCS file: /cvsroot/Insight/Insight/Code/Common/itkMacro.h,v retrieving revision 1.69 diff -r1.69 itkMacro.h 188a189,237 > > /** Set built-in type. Creates member Set"name"() (e.g., SetVisibility()); > * This should be use when the type is an enum. It is use to avoid warnings on > * some compilers with non specified enum types passed to itkDebugMacro.*/ > #define itkSetEnumMacro(name,type) \ > virtual void Set##name (const type _arg) \ > { \ > itkDebugMacro("setting " #name " to " << static_cast(_arg)); \ > if (this->m_##name != _arg) \ > { \ > this->m_##name = _arg; \ > this->Modified(); \ > } \ > } > > /** Get built-in type. Creates member Get"name"() (e.g., GetVisibility()); > * This should be use when the type is an enum. It is use to avoid warnings on > * some compilers with non specified enum types passed to itkDebugMacro.*/ > #define itkGetEnumMacro(name,type) \ > virtual type Get##name () \ > { \ > itkDebugMacro("returning " << #name " of " << static_cast(this->m_##name) ); \ > return this->m_##name; \ > } > > /** Get built-in type. Creates member Get"name"() (e.g., GetVisibility()); > * This is the "const" form of the itkGetMacro. It should be used unless > * the member can be changed through the "Get" access routine. > * This should be use when the type is an enum. It is use to avoid warnings on > * some compilers with non specified enum types passed to itkDebugMacro.*/ > #define itkGetConstEnumMacro(name,type) \ > virtual type Get##name () const \ > { \ > itkDebugMacro("returning " << #name " of " << static_cast(this->m_##name) ); \ > return this->m_##name; \ > } > > /** Get built-in type. Creates member Get"name"() (e.g., GetVisibility()); > * This is the "const" form of the itkGetMacro. It should be used unless > * the member can be changed through the "Get" access routine. > * This versions returns a const reference to the variable. > * This should be use when the type is an enum. It is use to avoid warnings on > * some compilers with non specified enum types passed to itkDebugMacro.*/ > #define itkGetConstReferenceEnumMacro(name,type) \ > virtual const type & Get##name () const \ > { \ > itkDebugMacro("returning " << #name " of " << static_cast(this->m_##name) ); \ > return this->m_##name; \ > } Index: Code/IO/itkDICOMSeriesFileNames.h =================================================================== RCS file: /cvsroot/Insight/Insight/Code/IO/itkDICOMSeriesFileNames.h,v retrieving revision 1.10 diff -r1.10 itkDICOMSeriesFileNames.h 131,132c131,132 < itkSetMacro(FileNameSortingOrder, FileNameSortingOrderType); < itkGetMacro(FileNameSortingOrder, FileNameSortingOrderType); --- > itkSetEnumMacro(FileNameSortingOrder, FileNameSortingOrderType); > itkGetEnumMacro(FileNameSortingOrder, FileNameSortingOrderType); Index: Code/IO/itkGDCMImageIO.h =================================================================== RCS file: /cvsroot/Insight/Insight/Code/IO/itkGDCMImageIO.h,v retrieving revision 1.30 diff -r1.30 itkGDCMImageIO.h 211,212c211,212 < itkSetMacro(CompressionType,TCompressionType); < itkGetConstReferenceMacro(CompressionType,TCompressionType); --- > itkSetEnumMacro(CompressionType,TCompressionType); > itkGetConstReferenceEnumMacro(CompressionType,TCompressionType); Index: Code/IO/itkImageIOBase.h =================================================================== RCS file: /cvsroot/Insight/Insight/Code/IO/itkImageIOBase.h,v retrieving revision 1.40 diff -r1.40 itkImageIOBase.h 136,137c136,137 < itkSetMacro(PixelType, IOPixelType); < itkGetConstReferenceMacro(PixelType, IOPixelType); --- > itkSetEnumMacro(PixelType, IOPixelType); > itkGetConstReferenceEnumMacro(PixelType, IOPixelType); 149,150c149,150 < itkSetMacro(ComponentType,IOComponentType); < itkGetConstReferenceMacro(ComponentType,IOComponentType); --- > itkSetEnumMacro(ComponentType,IOComponentType); > itkGetConstReferenceEnumMacro(ComponentType,IOComponentType); 182,183c182,183 < itkSetMacro(FileType,FileType); < itkGetConstReferenceMacro(FileType,FileType); --- > itkSetEnumMacro(FileType,FileType); > itkGetConstReferenceEnumMacro(FileType,FileType); 200,201c200,201 < itkSetMacro(ByteOrder,ByteOrder); < itkGetConstReferenceMacro(ByteOrder,ByteOrder); --- > itkSetEnumMacro(ByteOrder,ByteOrder); > itkGetConstReferenceEnumMacro(ByteOrder,ByteOrder);