diff options
Diffstat (limited to 'libstdc++-v3/src/locale.cc')
| -rw-r--r-- | libstdc++-v3/src/locale.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index 64996efb304..ae56bdbb040 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -38,7 +38,7 @@ #include <bits/std_vector.h> #include <bits/std_memory.h> // for auto_ptr #ifdef _GLIBCPP_USE_WCHAR_T - #include <bits/std_cwctype.h> // for towupper, etc. +# include <bits/std_cwctype.h> // for towupper, etc. #endif namespace std { @@ -952,7 +952,7 @@ namespace std { do_widen(const char* __low, const char* __high, wchar_t* __dest) const { mbstate_t __state; - memset(&__state, 0, sizeof(mbstate_t)); + memset(static_cast<void*>(&__state), 0, sizeof(mbstate_t)); mbsrtowcs(__dest, &__low, __high - __low, &__state); return __high; } @@ -971,7 +971,7 @@ namespace std { char* __dest) const { mbstate_t __state; - memset(&__state, 0, sizeof(mbstate_t)); + memset(static_cast<void*>(&__state), 0, sizeof(mbstate_t)); size_t __len = __high - __low; size_t __conv = wcsrtombs(__dest, &__low, __len, &__state); if (__conv == __len) |