update cppcommon for trim