Changes for C++11, but there is a build fail for QNX