Stop CPP from emitting useless warnings
Merge pull request #587 from david-christiansen/cpp-warnings

Stop CPP from emitting useless warnings