[cvs-nhc98] patch applied (york-compiler98): Fix for cpphs API changes