Add a fix needed for current versions of g++.