Rename __is_signed to __is_signed_val to avoid conflict with a type
trait in Clang.
This commit is contained in:
parent
52b9a33a36
commit
85fc5176f6
|
@ -464,7 +464,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
|
|||
bool __testfail = false;
|
||||
bool __testoverflow = false;
|
||||
const __unsigned_type __max =
|
||||
(__negative && __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
|
||||
(__negative && __gnu_cxx::__numeric_traits<_ValueT>::__is_signed_val)
|
||||
? -__gnu_cxx::__numeric_traits<_ValueT>::__min
|
||||
: __gnu_cxx::__numeric_traits<_ValueT>::__max;
|
||||
const __unsigned_type __smax = __max / __base;
|
||||
|
@ -568,7 +568,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
|
|||
else if (__testoverflow)
|
||||
{
|
||||
if (__negative
|
||||
&& __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
|
||||
&& __gnu_cxx::__numeric_traits<_ValueT>::__is_signed_val)
|
||||
__v = __gnu_cxx::__numeric_traits<_ValueT>::__min;
|
||||
else
|
||||
__v = __gnu_cxx::__numeric_traits<_ValueT>::__max;
|
||||
|
@ -891,7 +891,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
|
|||
if (__v >= 0)
|
||||
{
|
||||
if (bool(__flags & ios_base::showpos)
|
||||
&& __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
|
||||
&& __gnu_cxx::__numeric_traits<_ValueT>::__is_signed_val)
|
||||
*--__cs = __lit[__num_base::_S_oplus], ++__len;
|
||||
}
|
||||
else
|
||||
|
|
|
@ -929,8 +929,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
|||
typedef typename iterator_traits<_II2>::value_type _ValueType2;
|
||||
const bool __simple =
|
||||
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
|
||||
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
|
||||
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
|
||||
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed_val
|
||||
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed_val
|
||||
&& __is_pointer<_II1>::__value
|
||||
&& __is_pointer<_II2>::__value);
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|||
|
||||
// NB: these two also available in std::numeric_limits as compile
|
||||
// time constants, but <limits> is big and we avoid including it.
|
||||
static const bool __is_signed = __glibcxx_signed(_Value);
|
||||
static const bool __is_signed_val = __glibcxx_signed(_Value);
|
||||
static const int __digits = __glibcxx_digits(_Value);
|
||||
};
|
||||
|
||||
|
@ -69,7 +69,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|||
const _Value __numeric_traits_integer<_Value>::__max;
|
||||
|
||||
template<typename _Value>
|
||||
const bool __numeric_traits_integer<_Value>::__is_signed;
|
||||
const bool __numeric_traits_integer<_Value>::__is_signed_val;
|
||||
|
||||
template<typename _Value>
|
||||
const int __numeric_traits_integer<_Value>::__digits;
|
||||
|
@ -101,7 +101,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|||
static const int __max_digits10 = __glibcxx_max_digits10(_Value);
|
||||
|
||||
// See above comment...
|
||||
static const bool __is_signed = true;
|
||||
static const bool __is_signed_val = true;
|
||||
static const int __digits10 = __glibcxx_digits10(_Value);
|
||||
static const int __max_exponent10 = __glibcxx_max_exponent10(_Value);
|
||||
};
|
||||
|
@ -110,7 +110,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|||
const int __numeric_traits_floating<_Value>::__max_digits10;
|
||||
|
||||
template<typename _Value>
|
||||
const bool __numeric_traits_floating<_Value>::__is_signed;
|
||||
const bool __numeric_traits_floating<_Value>::__is_signed_val;
|
||||
|
||||
template<typename _Value>
|
||||
const int __numeric_traits_floating<_Value>::__digits10;
|
||||
|
|
Loading…
Reference in New Issue