changed enum to makmake C++ porting easier