Code change for clang++ compile