Compiler fix for compiling from work with g++ 4.6 or less