make code C++ warning clean (again)