OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r243355
This commit is contained in:
Jonathan Wakely 2016-12-07 15:23:01 +00:00 committed by Jonathan Wakely
parent d71f5aa799
commit 435f434288
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,8 @@
2016-12-07 Jonathan Wakely <jwakely@redhat.com> 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 * testsuite/28_regex/traits/char/user_defined.cc: Replace uses of
C++14 std::exchange function. C++14 std::exchange function.

5
libstdc++-v3/include/experimental/bits/fs_path.h
View File

@ -418,7 +418,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
_S_convert(_Iter __first, _Iter __last) _S_convert(_Iter __first, _Iter __last)
{ {
using __value_type = typename std::iterator_traits<_Iter>::value_type; 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> template<typename _InputIterator>
@ -426,7 +427,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
_S_convert(_InputIterator __src, __null_terminated) _S_convert(_InputIterator __src, __null_terminated)
{ {
using _Tp = typename std::iterator_traits<_InputIterator>::value_type; 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) for (; *__src != _Tp{}; ++__src)
__tmp.push_back(*__src); __tmp.push_back(*__src);
return _S_convert(__tmp.c_str(), __tmp.c_str() + __tmp.size()); return _S_convert(__tmp.c_str(), __tmp.c_str() + __tmp.size());