Changes for fcppt/enum