Avoid extra cast()s after CStr::as_ptr()
#129332
Merged
cast()s after CStr::as_ptr()
#129332