trq-1953 Fixed rcp to build with C++.