Fix remaining uses of \Cpp macro#1366

jwakely merged 1 commit intocplusplus:mastercplusplus/draft:masterfrom

AlisdairM:apply_cpp_macroAlisdairM/draft:apply_cpp_macroCopy head branch name to clipboard