linux gcc 4.8 compile check
fix for gcc 4.8 on linux
fix conflict