From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 16 Mar 2017 17:22:47 +0000 (+0000)
Subject: PR libstdc++/79980 fix target type of cast
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e363c939cb507a00eab85c0cd441ee98a5f3a7fb;p=gcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cf94ab538e3..d035d91ab13 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 ef38267e855..02866efe5fa 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)); }