feedc0de/boost_conversion
1
0
Fork 0
forked from boostorg/conversion
Code Pull Requests Activity

FIx bug in conversion of some std::array implementations (refs #7799)

Browse Source 
[SVN r82172]
This commit is contained in:
Antony Polukhin
2012-12-22 18:42:04 +00:00
parent 5a6309db7a
commit 4ad6f1bd4b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/lexical_cast.hpp
View File

@@ -1771,7 +1771,10 @@ namespace boost {
#ifndef BOOST_NO_CXX11_HDR_ARRAY #ifndef BOOST_NO_CXX11_HDR_ARRAY
template <std::size_t N> template <std::size_t N>
bool operator<<(std::array<CharT, N> const& input) BOOST_NOEXCEPT bool operator<<(std::array<CharT, N> const& input) BOOST_NOEXCEPT
{ return shl_char_array_limited(input.begin(), N); } {
if (input.size()) return shl_char_array_limited(&input[0], N);
else return true;
}
template <std::size_t N> template <std::size_t N>
bool operator<<(std::array<unsigned char, N> const& input) BOOST_NOEXCEPT bool operator<<(std::array<unsigned char, N> const& input) BOOST_NOEXCEPT
@@ -1783,7 +1786,10 @@ namespace boost {
template <std::size_t N> template <std::size_t N>
bool operator<<(std::array<const CharT, N> const& input) BOOST_NOEXCEPT bool operator<<(std::array<const CharT, N> const& input) BOOST_NOEXCEPT
{ return shl_char_array_limited(input.begin(), N); } {
if (input.size()) return shl_char_array_limited(&input[0], N);
else return true;
}
template <std::size_t N> template <std::size_t N>
bool operator<<(std::array<const unsigned char, N> const& input) BOOST_NOEXCEPT bool operator<<(std::array<const unsigned char, N> const& input) BOOST_NOEXCEPT
@@ -1984,8 +1990,8 @@ namespace boost {
return false; return false;
} }
memcpy(output.begin(), start, size * sizeof(CharT)); memcpy(&output[0], start, size * sizeof(CharT));
*(output.begin() + size) = Traits::to_char_type(0); output[size] = Traits::to_char_type(0);
return true; return true;
} }