Fixed building with newer versions of g++.