Fix gcc 490 warnings.
Merge pull request #3763 from ktf/fix-warnings

Gcc 4.9.0 -- Fix gcc 490 warnings.