On 2/7/19 1:57 PM, Martin Sebor wrote: > + /* The original numeric size as seen in the source code after > + any substitution and before conversion to size_t. */ I don't think this should mention substitution. With that tweak the C++ changes are OK. Jason