Commit 24cc0de9 by Jonathan Wakely Committed by Jonathan Wakely

libstdc++: Adjust some function templates for coding conventions

	* include/bits/fs_path.h (path::operator/=): Change template-head to
	use typename instead of class.
	* include/experimental/bits/fs_path.h (path::operator/=): Likewise.
	* include/std/ostream (operator<<): Likewise.

From-SVN: r278859
parent cd502796
2019-11-29 Jonathan Wakely <jwakely@redhat.com>
* include/bits/fs_path.h (path::operator/=): Change template-head to
use typename instead of class.
* include/experimental/bits/fs_path.h (path::operator/=): Likewise.
* include/std/ostream (operator<<): Likewise.
2019-11-29 Tom Honermann <tom@honermann.net> 2019-11-29 Tom Honermann <tom@honermann.net>
New tests New tests
......
...@@ -272,7 +272,7 @@ namespace __detail ...@@ -272,7 +272,7 @@ namespace __detail
path& operator/=(const path& __p); path& operator/=(const path& __p);
template <class _Source> template<typename _Source>
__detail::_Path<_Source>& __detail::_Path<_Source>&
operator/=(_Source const& __source) operator/=(_Source const& __source)
{ {
......
...@@ -278,7 +278,7 @@ namespace __detail ...@@ -278,7 +278,7 @@ namespace __detail
path& operator/=(const path& __p) { return _M_append(__p._M_pathname); } path& operator/=(const path& __p) { return _M_append(__p._M_pathname); }
template <class _Source> template<typename _Source>
__detail::_Path<_Source>& __detail::_Path<_Source>&
operator/=(_Source const& __source) operator/=(_Source const& __source)
{ return append(__source); } { return append(__source); }
......
...@@ -512,18 +512,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -512,18 +512,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ return (__out << __out.widen(__c)); } { return (__out << __out.widen(__c)); }
// Specialization // Specialization
template <class _Traits> template<typename _Traits>
inline basic_ostream<char, _Traits>& inline basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>& __out, char __c) operator<<(basic_ostream<char, _Traits>& __out, char __c)
{ return __ostream_insert(__out, &__c, 1); } { return __ostream_insert(__out, &__c, 1); }
// Signed and unsigned // Signed and unsigned
template<class _Traits> template<typename _Traits>
inline basic_ostream<char, _Traits>& inline basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>& __out, signed char __c) operator<<(basic_ostream<char, _Traits>& __out, signed char __c)
{ return (__out << static_cast<char>(__c)); } { return (__out << static_cast<char>(__c)); }
template<class _Traits> template<typename _Traits>
inline basic_ostream<char, _Traits>& inline basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>& __out, unsigned char __c) operator<<(basic_ostream<char, _Traits>& __out, unsigned char __c)
{ return (__out << static_cast<char>(__c)); } { return (__out << static_cast<char>(__c)); }
...@@ -533,37 +533,37 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -533,37 +533,37 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// numeric values. // numeric values.
#ifdef _GLIBCXX_USE_WCHAR_T #ifdef _GLIBCXX_USE_WCHAR_T
template<class _Traits> template<typename _Traits>
basic_ostream<char, _Traits>& basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, wchar_t) = delete; operator<<(basic_ostream<char, _Traits>&, wchar_t) = delete;
#endif // _GLIBCXX_USE_WCHAR_T #endif // _GLIBCXX_USE_WCHAR_T
#ifdef _GLIBCXX_USE_CHAR8_T #ifdef _GLIBCXX_USE_CHAR8_T
template<class _Traits> template<typename _Traits>
basic_ostream<char, _Traits>& basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, char8_t) = delete; operator<<(basic_ostream<char, _Traits>&, char8_t) = delete;
#endif #endif
template<class _Traits> template<typename _Traits>
basic_ostream<char, _Traits>& basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, char16_t) = delete; operator<<(basic_ostream<char, _Traits>&, char16_t) = delete;
template<class _Traits> template<typename _Traits>
basic_ostream<char, _Traits>& basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, char32_t) = delete; operator<<(basic_ostream<char, _Traits>&, char32_t) = delete;
#ifdef _GLIBCXX_USE_WCHAR_T #ifdef _GLIBCXX_USE_WCHAR_T
#ifdef _GLIBCXX_USE_CHAR8_T #ifdef _GLIBCXX_USE_CHAR8_T
template<class _Traits> template<typename _Traits>
basic_ostream<wchar_t, _Traits>& basic_ostream<wchar_t, _Traits>&
operator<<(basic_ostream<wchar_t, _Traits>&, char8_t) = delete; operator<<(basic_ostream<wchar_t, _Traits>&, char8_t) = delete;
#endif // _GLIBCXX_USE_CHAR8_T #endif // _GLIBCXX_USE_CHAR8_T
template<class _Traits> template<typename _Traits>
basic_ostream<wchar_t, _Traits>& basic_ostream<wchar_t, _Traits>&
operator<<(basic_ostream<wchar_t, _Traits>&, char16_t) = delete; operator<<(basic_ostream<wchar_t, _Traits>&, char16_t) = delete;
template<class _Traits> template<typename _Traits>
basic_ostream<wchar_t, _Traits>& basic_ostream<wchar_t, _Traits>&
operator<<(basic_ostream<wchar_t, _Traits>&, char32_t) = delete; operator<<(basic_ostream<wchar_t, _Traits>&, char32_t) = delete;
#endif // _GLIBCXX_USE_WCHAR_T #endif // _GLIBCXX_USE_WCHAR_T
...@@ -601,7 +601,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -601,7 +601,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s); operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s);
// Partial specializations // Partial specializations
template<class _Traits> template<typename _Traits>
inline basic_ostream<char, _Traits>& inline basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>& __out, const char* __s) operator<<(basic_ostream<char, _Traits>& __out, const char* __s)
{ {
...@@ -614,12 +614,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -614,12 +614,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
// Signed and unsigned // Signed and unsigned
template<class _Traits> template<typename _Traits>
inline basic_ostream<char, _Traits>& inline basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>& __out, const signed char* __s) operator<<(basic_ostream<char, _Traits>& __out, const signed char* __s)
{ return (__out << reinterpret_cast<const char*>(__s)); } { return (__out << reinterpret_cast<const char*>(__s)); }
template<class _Traits> template<typename _Traits>
inline basic_ostream<char, _Traits> & inline basic_ostream<char, _Traits> &
operator<<(basic_ostream<char, _Traits>& __out, const unsigned char* __s) operator<<(basic_ostream<char, _Traits>& __out, const unsigned char* __s)
{ return (__out << reinterpret_cast<const char*>(__s)); } { return (__out << reinterpret_cast<const char*>(__s)); }
...@@ -629,37 +629,37 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -629,37 +629,37 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// pointer values. // pointer values.
#ifdef _GLIBCXX_USE_WCHAR_T #ifdef _GLIBCXX_USE_WCHAR_T
template<class _Traits> template<typename _Traits>
basic_ostream<char, _Traits>& basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, const wchar_t*) = delete; operator<<(basic_ostream<char, _Traits>&, const wchar_t*) = delete;
#endif // _GLIBCXX_USE_WCHAR_T #endif // _GLIBCXX_USE_WCHAR_T
#ifdef _GLIBCXX_USE_CHAR8_T #ifdef _GLIBCXX_USE_CHAR8_T
template<class _Traits> template<typename _Traits>
basic_ostream<char, _Traits>& basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, const char8_t*) = delete; operator<<(basic_ostream<char, _Traits>&, const char8_t*) = delete;
#endif // _GLIBCXX_USE_CHAR8_T #endif // _GLIBCXX_USE_CHAR8_T
template<class _Traits> template<typename _Traits>
basic_ostream<char, _Traits>& basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, const char16_t*) = delete; operator<<(basic_ostream<char, _Traits>&, const char16_t*) = delete;
template<class _Traits> template<typename _Traits>
basic_ostream<char, _Traits>& basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, const char32_t*) = delete; operator<<(basic_ostream<char, _Traits>&, const char32_t*) = delete;
#ifdef _GLIBCXX_USE_WCHAR_T #ifdef _GLIBCXX_USE_WCHAR_T
#ifdef _GLIBCXX_USE_CHAR8_T #ifdef _GLIBCXX_USE_CHAR8_T
template<class _Traits> template<typename _Traits>
basic_ostream<wchar_t, _Traits>& basic_ostream<wchar_t, _Traits>&
operator<<(basic_ostream<wchar_t, _Traits>&, const char8_t*) = delete; operator<<(basic_ostream<wchar_t, _Traits>&, const char8_t*) = delete;
#endif #endif
template<class _Traits> template<typename _Traits>
basic_ostream<wchar_t, _Traits>& basic_ostream<wchar_t, _Traits>&
operator<<(basic_ostream<wchar_t, _Traits>&, const char16_t*) = delete; operator<<(basic_ostream<wchar_t, _Traits>&, const char16_t*) = delete;
template<class _Traits> template<typename _Traits>
basic_ostream<wchar_t, _Traits>& basic_ostream<wchar_t, _Traits>&
operator<<(basic_ostream<wchar_t, _Traits>&, const char32_t*) = delete; operator<<(basic_ostream<wchar_t, _Traits>&, const char32_t*) = delete;
#endif // _GLIBCXX_USE_WCHAR_T #endif // _GLIBCXX_USE_WCHAR_T
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment