Update cinoption for C++.