Modify to remove waring in VC++.
Revert "Modify to remove waring in VC++."

This reverts commit 67955516fab142af3d353b750c04c22ccee49fc6.