From dbabdb5220c44e5938d404eefb84b5ed55667ea8 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 2 Dec 2017 12:47:11 +0000
Subject: Vendor import of libc++ release_50 branch r319231:
 https://llvm.org/svn/llvm-project/libcxx/branches/release_50@319231

---
 include/algorithm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/algorithm')

diff --git a/include/algorithm b/include/algorithm
index 4542275adfda..00db6d7e7c87 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -3013,6 +3013,7 @@ template<class _Engine, class _UIntType>
 _UIntType
 __independent_bits_engine<_Engine, _UIntType>::__eval(true_type)
 {
+    const size_t _WRt = numeric_limits<result_type>::digits;
     result_type _Sp = 0;
     for (size_t __k = 0; __k < __n0_; ++__k)
     {
@@ -3021,7 +3022,7 @@ __independent_bits_engine<_Engine, _UIntType>::__eval(true_type)
         {
             __u = __e_() - _Engine::min();
         } while (__u >= __y0_);
-        if (__w0_ < _WDt)
+        if (__w0_ < _WRt)
             _Sp <<= __w0_;
         else
             _Sp = 0;
@@ -3034,7 +3035,7 @@ __independent_bits_engine<_Engine, _UIntType>::__eval(true_type)
         {
             __u = __e_() - _Engine::min();
         } while (__u >= __y1_);
-        if (__w0_ < _WDt - 1)
+        if (__w0_ < _WRt - 1)
             _Sp <<= __w0_ + 1;
         else
             _Sp = 0;
-- 
cgit v1.3