Builds with gcc 4.6 again