fix warnings
Merge pull request #7840 from minggo/fix-warning

fix warnings