Merge pull request #178 from rakuco/clear-mbstate_t-correctly

Correctly initialize std::mbstate_t.
This commit is contained in:
Tsuda Kageyu 2013-04-29 15:06:57 -07:00
commit 9f29804f60

View File

@ -78,9 +78,10 @@ namespace
char *dstBegin = dst;
char *dstEnd = dstBegin + dstLength;
std::mbstate_t st = 0;
std::mbstate_t st;
const wchar_t *source;
char *target;
memset(&st, 0, sizeof(st));
std::codecvt_base::result result = utf8_utf16_t().out(
st, srcBegin, srcEnd, source, dstBegin, dstEnd, target);
@ -123,9 +124,10 @@ namespace
wchar_t *dstBegin = dst;
wchar_t *dstEnd = dstBegin + dstLength;
std::mbstate_t st = 0;
std::mbstate_t st;
const char *source;
wchar_t *target;
memset(&st, 0, sizeof(st));
std::codecvt_base::result result = utf8_utf16_t().in(
st, srcBegin, srcEnd, source, dstBegin, dstEnd, target);