diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp index a6deacb6..d5d574d3 100644 --- a/src/wide_posix_api.cpp +++ b/src/wide_posix_api.cpp @@ -169,7 +169,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW* { result = std::wcslen(wnames[code]) + 1; 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]); #else 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); #endif 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); #else 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); #endif 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); #else std::wcscpy(buf, localbuf);