slightly different approach to windows warning fix
Merge branch 'warningsfixes' of https://github.com/ZappoMan/hifi into warningsfixes