bump CPlusPlus
better define handling