Fix build failures when using C++11
Some parts of the code weren't C++11 compatible and the build would fail with newer compilers.
This commit is contained in:
Some parts of the code weren't C++11 compatible and the build would fail with newer compilers.