Fixing compile errors due to the macro
Merge branch 'attributeMatrix' of ssh://github.com/dream3d/DREAM3D into attributeMatrix