Merge C++ from gomp-20050608-branch.