Now compiles in g++