- enhanced c++ patch to cover gcc 4.7