Update C++ bindings demo to new upstream API