Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix feature check for MSVC

This commit is contained in:
halx99 2023-01-03 18:01:40 +08:00
parent 2ad35decc3
commit 2522b1ef45
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/base/ccUtils.cpp
View File

@ -801,7 +801,15 @@ AX_DLL std::string base64Encode(std::string_view s)
if (n > 0) if (n > 0)
{ {
std::string ret; std::string ret;
#if defined(_HAS_CXX23) && _HAS_CXX23 /**
* @brief resize_and_overrite avaialbe on vs2022 17.1
* refer to:
* - https://learn.microsoft.com/en-us/cpp/overview/visual-cpp-language-conformance?view=msvc-170
* - https://github.com/microsoft/STL/wiki/Changelog#vs-2022-171
* - https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170
*
*/
#if defined(_HAS_CXX23) && _HAS_CXX23 && (_MSC_VER >= 1931)
ret.resize_and_overwrite(n, [&](char* p, size_t) { return ax::base64::encode(p, s.data(), s.length()); }); ret.resize_and_overwrite(n, [&](char* p, size_t) { return ax::base64::encode(p, s.data(), s.length()); });
#else #else
ret.resize(n); ret.resize(n);
@ -820,7 +828,7 @@ AX_DLL std::string base64Decode(std::string_view s)
{ {
std::string ret; std::string ret;
#if defined(_HAS_CXX23) && _HAS_CXX23 #if defined(_HAS_CXX23) && _HAS_CXX23 && (_MSC_VER >= 1931)
ret.resize_and_overwrite(n, [&](char* p, size_t) { return ax::base64::decode(p, s.data(), s.length()); }); ret.resize_and_overwrite(n, [&](char* p, size_t) { return ax::base64::decode(p, s.data(), s.length()); });
#else #else
ret.resize(n); ret.resize(n);