Codechange: Various C++ cleanups. #4
+55
−78
Merged
Loading