fixed further ifdef references for RoleAnnotations
Merge pull request #4 from tonyday567/master

fixed further ifdef references for RoleAnnotations