Updated for G++ 4.7 builds