[committed] libstdc++: Adjust <format> for Clang compatibility [PR107712]
Commit Message
Tested x86_64-linux. Pushed to trunk.
-- >8 --
Clang doesn't define __builtin_toupper, so use std::toupper.
Also add some (not actually required since C++20) typename keywords to
help Clang versions up to and including 15.
libstdc++-v3/ChangeLog:
PR libstdc++/107712
* include/std/format (__format::__formatter_int::format): Use
std::toupper when __builtin_toupper isn't available.
(basic_format_arg::handle): Add 'typename'.
* include/std/complex (complex<T>): Add 'typename'.
---
libstdc++-v3/include/std/complex | 2 +-
libstdc++-v3/include/std/format | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
@@ -1840,7 +1840,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
public:
typedef _Tp value_type;
- typedef std::__complex_type<_Tp>::type _ComplexT;
+ typedef typename std::__complex_type<_Tp>::type _ComplexT;
constexpr complex(_ComplexT __z) : _M_value(__z) { }
@@ -52,6 +52,10 @@
#include <bits/utility.h> // tuple_size_v
#include <ext/numeric_traits.h> // __int_traits
+#if !__has_builtin(__builtin_toupper)
+# include <cctype>
+#endif
+
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -1027,7 +1031,11 @@ namespace __format
__res = to_chars(__start, __end, __u, 16);
if (_M_spec._M_type == _Pres_X)
for (auto __p = __start; __p != __res.ptr; ++__p)
+#if __has_builtin(__builtin_toupper)
*__p = __builtin_toupper(*__p);
+#else
+ *__p = std::toupper(*__p);
+#endif
break;
default:
__builtin_unreachable();
@@ -2718,7 +2726,7 @@ namespace __format
public:
class handle : public __format::_Arg_value<_Context>::_HandleBase
{
- using _Base = __format::_Arg_value<_Context>::_HandleBase;
+ using _Base = typename __format::_Arg_value<_Context>::_HandleBase;
// Format as const if possible, to reduce instantiations.
template<typename _Tp>