Reverted C++11 use of auto.

* Caused compatibility problems between compilers.