fixed #1808: Updated the submodule of cxx-generator and fixed some compilation errors after that.

Refers to https://github.com/funkaster/cxx-generator/pull/31 .