code change for clang++ compatibility