Fixed compilation errors with clang.

H: Enter commit message.  Lines beginning with 'HG:' are removed.
4 files changed