modify c++1y style