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