Use proper C++ now that named macros require it.

(cherry picked from commit f6aff1ae5f6b626aac32c47a490ea550e865b162)