diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-03-16 17:22:47 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-03-16 17:22:47 +0000 |
| commit | e363c939cb507a00eab85c0cd441ee98a5f3a7fb (patch) | |
| tree | aad3acf575aea33cc9571400be47e0a358a02066 | |
| parent | e711928b48b62d04a44c098322441fe80ea88839 (diff) | |
| download | gcc-e363c939cb507a00eab85c0cd441ee98a5f3a7fb.zip gcc-e363c939cb507a00eab85c0cd441ee98a5f3a7fb.tar.gz gcc-e363c939cb507a00eab85c0cd441ee98a5f3a7fb.tar.bz2 | |
PR libstdc++/79980 fix target type of cast
PR libstdc++/79980
* src/c++11/codecvt.cc (to_integer(codecvt_mode)): Fix target type.
From-SVN: r246205
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/codecvt.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cf94ab5..d035d91 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2017-03-16 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/79980 + * src/c++11/codecvt.cc (to_integer(codecvt_mode)): Fix target type. + PR libstdc++/80041 * src/c++11/codecvt.cc (__codecvt_utf16_base<wchar_t>::do_out) (__codecvt_utf16_base<wchar_t>::do_in): Convert char arguments to diff --git a/libstdc++-v3/src/c++11/codecvt.cc b/libstdc++-v3/src/c++11/codecvt.cc index ef38267..02866ef 100644 --- a/libstdc++-v3/src/c++11/codecvt.cc +++ b/libstdc++-v3/src/c++11/codecvt.cc @@ -34,7 +34,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // The standard doesn't define these operators, which is annoying. static underlying_type<codecvt_mode>::type to_integer(codecvt_mode m) - { return static_cast<mode_t>(m); } + { return static_cast<underlying_type<codecvt_mode>::type>(m); } static codecvt_mode& operator&=(codecvt_mode& m, codecvt_mode n) { return m = codecvt_mode(to_integer(m) & to_integer(n)); } |