Repair C++ version of program-options.c