Remove C++11 use of "auto" keyword

C++11 features have not been introduced yet on this branch.