Fix clang issue.
Merge pull request #3573 from ktf/fix-clang-issue

Clang -- Fix clang compilation issue.