Modify C++ output to suppress a warning.
Update examples to match current compiler output.