vchoi_fork

[svn-r11831] Purpose: Bug fix and warning fix.

Description: The g++ compiler on sleipnir doesn't like variable name
"class".  There're also some other warnings.

Solution: Changed "class" to another name and fixed the warnings.

Platforms tested: sleipnir - simple changes.