Adapt to g++