Remove the dependence on c++11/gnu++11