From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 7 Dec 2016 15:23:01 +0000 (+0000)
Subject: Replace uses of C++14 remove_cv_t alias in C++11 header
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=435f4342880e048a63f7c139d5b2b3b7e7bc6b89;p=gcc.git

Replace uses of C++14 remove_cv_t alias in C++11 header

	* include/experimental/bits/fs_path.h (path::_S_convert): Replace
	uses of C++14 std::remove_cv_t alias template.

From-SVN: r243355
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60123289cae..28c5d9d7871 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2016-12-07  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/experimental/bits/fs_path.h (path::_S_convert): Replace
+	uses of C++14 std::remove_cv_t alias template.
+
 	* testsuite/28_regex/traits/char/user_defined.cc: Replace uses of
 	C++14 std::exchange function.
 
diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h
index 70a5445dfa8..a69fb9db8d6 100644
--- a/libstdc++-v3/include/experimental/bits/fs_path.h
+++ b/libstdc++-v3/include/experimental/bits/fs_path.h
@@ -418,7 +418,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
       _S_convert(_Iter __first, _Iter __last)
       {
 	using __value_type = typename std::iterator_traits<_Iter>::value_type;
-	return _Cvt<remove_cv_t<__value_type>>::_S_convert(__first, __last);
+	return _Cvt<typename remove_cv<__value_type>::type>::
+	  _S_convert(__first, __last);
       }
 
     template<typename _InputIterator>
@@ -426,7 +427,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
       _S_convert(_InputIterator __src, __null_terminated)
       {
 	using _Tp = typename std::iterator_traits<_InputIterator>::value_type;
-	std::basic_string<remove_cv_t<_Tp>> __tmp;
+	std::basic_string<typename remove_cv<_Tp>::type> __tmp;
 	for (; *__src != _Tp{}; ++__src)
 	  __tmp.push_back(*__src);
 	return _S_convert(__tmp.c_str(), __tmp.c_str() + __tmp.size());