Change code for clang++ compile on mac