Fix from gcc to g++