Do not rely on enum values in c++ conversion code

Do not rely on enum values in c++ conversion code #878