Looks good to me.

@jensmaurer: Are you sure that "function" doesn't subtly introduce a more constrained notion than "routine"? I'd be happy to merge if you are confident that this is correct.

For fun, I searched for occurrences of "routine" in the C99 standard. Of the five I found, three appear as synonym for "function", one occurs in "objects referred to by interrupt service routines activated by the signal function" (which I guess refers to callback functions), and the fifth and most interesting one is:

A principal use of the sizeof operator is in communication with routines such as storage allocators and I/O systems.

Sounds old-timey to me, haven't heard of an I/O system referred to as a "routine" recently. :) But I guess that's the kind of less constrained notion you might have been thinking of. Feel free to close if that's what's intended. In that case, though, perhaps we ought to have a proper definition for the term?

@tkoeppe: "routine" is an undefined concept in C++. I've reviewed the patch again, and in all cases, we're directly talking about "functions" as C++ understands them. Mentioning a "routine" is just a colloquialism that crept in.