Fixing g++ compatibility