C++98 compile errors fixed

svn path=/sandbox/; revision=83054