Proper C++ in tutorials, now that names macros require it.

(cherry picked from commit f03225c12c699a3e31ee091ed1836ef010e8619a)