Fix MSVC C++ ABI build. Close #2588.
Merge pull request #2589 from take-cheeze/fix_msvc_cxx

Fix MSVC C++ ABI build. Close #2588.