You may already have this in the trunk, however, I needed to make some diff for compiling under a recent ubuntu 9.10, e.g.,
$ g++ --version g++ (Ubuntu 4.4.1-4ubuntu8) 4.4.1 Copyright (C) 2009 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.