Correct the g++ friendliness