separate commit : struct2class.cxx