Update C++ demo to new upstream changes

No match.