Add C++ solution for 17.1

Agree to merge