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

fix warnings