Improve compatibility with C++11 (Visual Studio 2012, Intel Compiler 13.0)

Allow code to be compiled with new tools.