Fix compilation issues with master branch when OpenMPI is built with --enable-cxx...