Kill more warnings from the SGI compiler.
Part of SF patch #434992.
2 files changed