update cpp for not-c++1 compat