diff options
Diffstat (limited to 'libs/log/src/code_conversion.cpp')
| -rw-r--r-- | libs/log/src/code_conversion.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/log/src/code_conversion.cpp b/libs/log/src/code_conversion.cpp index 6e4b2b70a..c4288fe99 100644 --- a/libs/log/src/code_conversion.cpp +++ b/libs/log/src/code_conversion.cpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2014. + * Copyright Andrey Semashev 2007 - 2015. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -125,6 +125,9 @@ BOOST_LOG_API void code_convert(const char* str1, std::size_t len, std::wstring& code_convert(str1, str1 + len, str2, std::use_facet< std::codecvt< wchar_t, char, std::mbstate_t > >(loc)); } +// Note: MSVC 2015 (aka VC14) implement char16_t and char32_t types but not codecvt locale facets +#if !defined(BOOST_MSVC) + #if !defined(BOOST_NO_CXX11_CHAR16_T) //! The function converts one string to the character type of another @@ -157,6 +160,8 @@ BOOST_LOG_API void code_convert(const char* str1, std::size_t len, std::u32strin #endif +#endif // !defined(BOOST_MSVC) + } // namespace aux BOOST_LOG_CLOSE_NAMESPACE // namespace log |