Skip to content

C++ compatibility fixes #2423

C++ compatibility fixes

C++ compatibility fixes #2423