changes for gpcxx