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

Merge pull request #221 from boostorg/pr/fix-clang-cl-2

Browse Source 
Define _CRT_SECURE_NO_WARNINGS instead of using wcscpy_s. Fixes #219.
This commit is contained in:
jzmaddock
2024-09-03 11:29:56 +01:00
committed by GitHub
parent e61e5e111e 65726f3d2f
commit 49c4e8cb8f
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/wide_posix_api.cpp
View File

@ -16,6 +16,7 @@
* DESCRIPTION: Implements the wide character POSIX API wrappers. * DESCRIPTION: Implements the wide character POSIX API wrappers.
*/ */
#define _CRT_SECURE_NO_WARNINGS // for std::wcscpy
#define BOOST_REGEX_SOURCE #define BOOST_REGEX_SOURCE
#include <boost/regex/config.hpp> #include <boost/regex/config.hpp>
@ -169,11 +170,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))
::wcscpy_s(buf, buf_size, wnames[code]);
#else
std::wcscpy(buf, wnames[code]); std::wcscpy(buf, wnames[code]);
#endif
return result; return result;
} }
return result; return result;
@ -193,11 +190,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)
::wcscpy_s(buf, buf_size, localbuf);
#else
std::wcscpy(buf, localbuf); std::wcscpy(buf, localbuf);
#endif
return std::wcslen(localbuf) + 1; return std::wcslen(localbuf) + 1;
} }
} }
@ -207,11 +200,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)
::wcscpy_s(buf, buf_size, localbuf);
#else
std::wcscpy(buf, localbuf); std::wcscpy(buf, localbuf);
#endif
return std::wcslen(localbuf) + 1; return std::wcslen(localbuf) + 1;
} }
if(code <= (int)REG_E_UNKNOWN) if(code <= (int)REG_E_UNKNOWN)