harmonize with current C++ version