diff mbox

[2/2] Replace uses of C++14 remove_cv_t alias in C++11 header

Message ID 20161207152834.GX6326@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely Dec. 7, 2016, 3:28 p.m. UTC 
Most filesystem tests test fail when run with -std=gnu++11

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

Tested x86_64-linux, committed to trunk.
diff mbox

Patch

commit c5d7518d15c540541a77e997ba4bb6d33703bedd
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Dec 7 14:33:24 2016 +0000

    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.

diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h
index 70a5445..a69fb9d 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());