Re: [PATCH21.5] Add cast to fix C++ build