Fix all the compiler errors for conversion to C++98.