diff options
Diffstat (limited to 'boost/log/detail/code_conversion.hpp')
| -rw-r--r-- | boost/log/detail/code_conversion.hpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/boost/log/detail/code_conversion.hpp b/boost/log/detail/code_conversion.hpp index d49988bc21..4c39f9c02b 100644 --- a/boost/log/detail/code_conversion.hpp +++ b/boost/log/detail/code_conversion.hpp @@ -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) @@ -35,6 +35,9 @@ namespace aux { BOOST_LOG_API void code_convert(const wchar_t* str1, std::size_t len, std::string& str2, std::locale const& loc = std::locale()); //! The function converts one string to the character type of another BOOST_LOG_API void code_convert(const char* str1, std::size_t len, std::wstring& str2, std::locale const& loc = std::locale()); + +// 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 BOOST_LOG_API void code_convert(const char16_t* str1, std::size_t len, std::string& str2, std::locale const& loc = std::locale()); @@ -47,6 +50,7 @@ BOOST_LOG_API void code_convert(const char32_t* str1, std::size_t len, std::stri //! The function converts one string to the character type of another BOOST_LOG_API void code_convert(const char* str1, std::size_t len, std::u32string& str2, std::locale const& loc = std::locale()); #endif +#endif // !defined(BOOST_MSVC) //! The function converts one string to the character type of another template< typename CharT, typename SourceTraitsT, typename SourceAllocatorT, typename TargetTraitsT, typename TargetAllocatorT > |