View | Details | Return to bug 88775 | Differences between
and this patch

Collapse All | Expand All

(-)libstdc++-v3/include/bits/stl_function.h.jj (+24 lines)
Lines 413-420 _GLIBCXX_BEGIN_NAMESPACE_VERSION Link Here
413
      _GLIBCXX14_CONSTEXPR bool
413
      _GLIBCXX14_CONSTEXPR bool
414
      operator()(_Tp* __x, _Tp* __y) const _GLIBCXX_NOTHROW
414
      operator()(_Tp* __x, _Tp* __y) const _GLIBCXX_NOTHROW
415
      {
415
      {
416
#if __cplusplus >= 201402L
417
#ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED
418
	if (__builtin_is_constant_evaluated ())
419
#else
416
	if (__builtin_constant_p (__x > __y))
420
	if (__builtin_constant_p (__x > __y))
421
#endif
417
	  return __x > __y;
422
	  return __x > __y;
423
#endif
418
	return (__UINTPTR_TYPE__)__x > (__UINTPTR_TYPE__)__y;
424
	return (__UINTPTR_TYPE__)__x > (__UINTPTR_TYPE__)__y;
419
      }
425
      }
420
    };
426
    };
Lines 426-433 _GLIBCXX_BEGIN_NAMESPACE_VERSION Link Here
426
      _GLIBCXX14_CONSTEXPR bool
432
      _GLIBCXX14_CONSTEXPR bool
427
      operator()(_Tp* __x, _Tp* __y) const _GLIBCXX_NOTHROW
433
      operator()(_Tp* __x, _Tp* __y) const _GLIBCXX_NOTHROW
428
      {
434
      {
435
#if __cplusplus >= 201402L
436
#ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED
437
	if (__builtin_is_constant_evaluated ())
438
#else
429
	if (__builtin_constant_p (__x < __y))
439
	if (__builtin_constant_p (__x < __y))
440
#endif
430
	  return __x < __y;
441
	  return __x < __y;
442
#endif
431
	return (__UINTPTR_TYPE__)__x < (__UINTPTR_TYPE__)__y;
443
	return (__UINTPTR_TYPE__)__x < (__UINTPTR_TYPE__)__y;
432
      }
444
      }
433
    };
445
    };
Lines 439-446 _GLIBCXX_BEGIN_NAMESPACE_VERSION Link Here
439
      _GLIBCXX14_CONSTEXPR bool
451
      _GLIBCXX14_CONSTEXPR bool
440
      operator()(_Tp* __x, _Tp* __y) const _GLIBCXX_NOTHROW
452
      operator()(_Tp* __x, _Tp* __y) const _GLIBCXX_NOTHROW
441
      {
453
      {
454
#if __cplusplus >= 201402L
455
#ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED
456
	if (__builtin_is_constant_evaluated ())
457
#else
442
	if (__builtin_constant_p (__x >= __y))
458
	if (__builtin_constant_p (__x >= __y))
459
#endif
443
	  return __x >= __y;
460
	  return __x >= __y;
461
#endif
444
	return (__UINTPTR_TYPE__)__x >= (__UINTPTR_TYPE__)__y;
462
	return (__UINTPTR_TYPE__)__x >= (__UINTPTR_TYPE__)__y;
445
      }
463
      }
446
    };
464
    };
Lines 452-459 _GLIBCXX_BEGIN_NAMESPACE_VERSION Link Here
452
      _GLIBCXX14_CONSTEXPR bool
470
      _GLIBCXX14_CONSTEXPR bool
453
      operator()(_Tp* __x, _Tp* __y) const _GLIBCXX_NOTHROW
471
      operator()(_Tp* __x, _Tp* __y) const _GLIBCXX_NOTHROW
454
      {
472
      {
473
#if __cplusplus >= 201402L
474
#ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED
475
	if (__builtin_is_constant_evaluated ())
476
#else
455
	if (__builtin_constant_p (__x <= __y))
477
	if (__builtin_constant_p (__x <= __y))
478
#endif
456
	  return __x <= __y;
479
	  return __x <= __y;
480
#endif
457
	return (__UINTPTR_TYPE__)__x <= (__UINTPTR_TYPE__)__y;
481
	return (__UINTPTR_TYPE__)__x <= (__UINTPTR_TYPE__)__y;
458
      }
482
      }
459
    };
483
    };

Return to bug 88775