feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Update preprocessor conditions to test for the MS STL, rather than specific compilers. Fixes #219.

Browse Source
This commit is contained in:
Peter Dimov
2024-09-02 10:03:29 +03:00
parent 5243906d23
commit af15d9a5c3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wide_posix_api.cpp
View File

@ -169,7 +169,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
{ {
result = std::wcslen(wnames[code]) + 1; result = std::wcslen(wnames[code]) + 1;
if(buf_size >= result) if(buf_size >= result)
#if (BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)) || (defined(BOOST_CLANG) && defined(_MSC_VER)) #if defined(BOOST_MSSTL_VERSION)
::wcscpy_s(buf, buf_size, wnames[code]); ::wcscpy_s(buf, buf_size, wnames[code]);
#else #else
std::wcscpy(buf, wnames[code]); std::wcscpy(buf, wnames[code]);
@ -193,7 +193,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
(boost::core::swprintf)(localbuf, 5, L"%d", i); (boost::core::swprintf)(localbuf, 5, L"%d", i);
#endif #endif
if(std::wcslen(localbuf) < buf_size) if(std::wcslen(localbuf) < buf_size)
#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE) #if defined(BOOST_MSSTL_VERSION)
::wcscpy_s(buf, buf_size, localbuf); ::wcscpy_s(buf, buf_size, localbuf);
#else #else
std::wcscpy(buf, localbuf); std::wcscpy(buf, localbuf);
@ -207,7 +207,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
(boost::core::swprintf)(localbuf, 5, L"%d", 0); (boost::core::swprintf)(localbuf, 5, L"%d", 0);
#endif #endif
if(std::wcslen(localbuf) < buf_size) if(std::wcslen(localbuf) < buf_size)
#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE) #if defined(BOOST_MSSTL_VERSION)
::wcscpy_s(buf, buf_size, localbuf); ::wcscpy_s(buf, buf_size, localbuf);
#else #else
std::wcscpy(buf, localbuf); std::wcscpy(buf, localbuf);