Switch to c++ compiler