Update for gcc 4.8.0