minor c++ificatio
rename to C++ interim commit
more c++ guards, one enum operator, and build fixes