If I understand that branch correctly, the attached patch should suffice 
to port to GCC 4.6+ on OS X.  It's relative to trunk bzr 117895.  I 
don't have easy access to OS X to try it, though. Peter and/or Samuel, 
does it work for you?