From ffac6a20357437ea5a2ff0462c3f504a9a7a27b0 Mon Sep 17 00:00:00 2001 From: Mikael Olenfalk Date: Sun, 4 Oct 2015 22:24:27 +0200 Subject: [PATCH] universal-windows: Do not define BOOST_REGEX_HAS_OTHER_WCHAR_T Just as on VC10 this causes linker errors with std::collate::id. --- include/boost/regex/config.hpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp index 3cea8998..af2c2fa4 100644 --- a/include/boost/regex/config.hpp +++ b/include/boost/regex/config.hpp @@ -178,10 +178,20 @@ * with MSVC and the /Zc:wchar_t option we place some extra unsigned short versions * of the non-inline functions in the library, so that users can still link to the lib, * irrespective of whether their own code is built with /Zc:wchar_t. - * Note that this does NOT WORK with VC10 when the C++ locale is in effect as + * Note that this does NOT WORK with VC10 and VC14 when the C++ locale is in effect as * the locale's facets simply do not compile in that case. + * As we default to the C++ locale when compiling for the windows runtime we + * skip in this case aswell. */ -#if defined(__cplusplus) && (defined(BOOST_MSVC) || defined(__ICL)) && !defined(BOOST_NO_INTRINSIC_WCHAR_T) && defined(BOOST_WINDOWS) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) && !defined(BOOST_RWSTD_VER) && ((_MSC_VER < 1600) || !defined(BOOST_REGEX_USE_CPP_LOCALE)) +#if defined(__cplusplus) && \ + (defined(BOOST_MSVC) || defined(__ICL)) && \ + !defined(BOOST_NO_INTRINSIC_WCHAR_T) && \ + defined(BOOST_WINDOWS) && \ + !defined(__SGI_STL_PORT) && \ + !defined(_STLPORT_VERSION) && \ + !defined(BOOST_RWSTD_VER) && \ + ((_MSC_VER < 1600) || !defined(BOOST_REGEX_USE_CPP_LOCALE)) && \ + !BOOST_PLAT_WINDOWS_RUNTIME # define BOOST_REGEX_HAS_OTHER_WCHAR_T # ifdef BOOST_MSVC # pragma warning(push)