Update C++ code
Update C++ code